From acf94fa6509e27083ef96fa230689732b4740d20 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Fri, 10 Apr 2015 14:48:38 +0000 Subject: [PATCH] # incremented the version number to 0.2.0 # switched PHP short open tags to the full open tags. # included pecl-svn into the project # fixed various RPM packaging problems for PHP 5.3 and SELinux --- codepot/DEBIAN/Makefile.in | 4 + codepot/Makefile.am | 8 +- codepot/Makefile.in | 11 +- codepot/README | 109 +- codepot/codepot.spec.in | 42 +- codepot/configure | 124 +- codepot/configure.ac | 31 +- codepot/etc/Makefile.in | 4 + codepot/etc/codepot.ini.in | 20 +- codepot/etc/codepot.mysql | 6 +- codepot/pecl-svn/CREDITS | 2 + codepot/pecl-svn/EXPERIMENTAL | 0 codepot/pecl-svn/Makefile.am | 22 + codepot/pecl-svn/Makefile.in | 384 ++ codepot/pecl-svn/README | 9 + codepot/pecl-svn/TODO | 12 + codepot/pecl-svn/config.m4 | 88 + codepot/pecl-svn/config.w32 | 40 + codepot/pecl-svn/examples/hook_copycommit.php | 108 + .../pecl-svn/examples/hook_emailcommit.php | 157 + codepot/pecl-svn/package.xml | 350 ++ codepot/pecl-svn/php_svn.h | 169 + codepot/pecl-svn/svn.c | 4442 +++++++++++++++++ codepot/pecl-svn/svn.ini | 2 + codepot/sbin/Makefile.in | 4 + codepot/sbin/codepot-user.in | 29 +- codepot/src/Makefile.in | 4 + codepot/src/codepot/Makefile.in | 4 + codepot/src/codepot/config/Makefile.in | 4 + codepot/src/codepot/controllers/Makefile.in | 4 + codepot/src/codepot/errors/Makefile.in | 4 + codepot/src/codepot/helpers/Makefile.in | 4 + codepot/src/codepot/hooks/Makefile.in | 4 + codepot/src/codepot/language/Makefile.in | 4 + .../src/codepot/language/english/Makefile.in | 4 + .../codepot/language/indonesian/Makefile.in | 4 + .../src/codepot/language/korean/Makefile.in | 4 + codepot/src/codepot/libraries/Makefile.in | 4 + codepot/src/codepot/models/Makefile.in | 4 + codepot/src/codepot/views/Makefile.in | 4 + codepot/src/codepot/views/code_blame.php | 54 +- codepot/src/codepot/views/code_diff.php | 16 +- codepot/src/codepot/views/code_file.php | 58 +- codepot/src/codepot/views/code_folder.php | 72 +- codepot/src/codepot/views/code_history.php | 12 +- codepot/src/codepot/views/code_revision.php | 60 +- codepot/src/codepot/views/code_search.php | 24 +- codepot/src/codepot/views/error.php | 10 +- codepot/src/codepot/views/file_delete.php | 22 +- codepot/src/codepot/views/file_edit.php | 62 +- codepot/src/codepot/views/file_home.php | 8 +- codepot/src/codepot/views/file_show.php | 56 +- codepot/src/codepot/views/footer.php | 4 +- codepot/src/codepot/views/graph_main.php | 52 +- codepot/src/codepot/views/issue_delete.php | 22 +- codepot/src/codepot/views/issue_edit.php | 58 +- codepot/src/codepot/views/issue_home.php | 44 +- codepot/src/codepot/views/issue_show.php | 78 +- codepot/src/codepot/views/log.php | 28 +- codepot/src/codepot/views/login.php | 26 +- codepot/src/codepot/views/project_catalog.php | 36 +- codepot/src/codepot/views/project_delete.php | 24 +- codepot/src/codepot/views/project_edit.php | 76 +- codepot/src/codepot/views/project_home.php | 48 +- codepot/src/codepot/views/site_catalog.php | 6 +- codepot/src/codepot/views/site_delete.php | 22 +- codepot/src/codepot/views/site_edit.php | 56 +- codepot/src/codepot/views/site_home.php | 24 +- codepot/src/codepot/views/site_show.php | 26 +- codepot/src/codepot/views/taskbar.php | 2 +- codepot/src/codepot/views/user_home.php | 16 +- codepot/src/codepot/views/user_settings.php | 30 +- codepot/src/codepot/views/wiki_delete.php | 22 +- codepot/src/codepot/views/wiki_edit.php | 64 +- codepot/src/codepot/views/wiki_home.php | 8 +- codepot/src/codepot/views/wiki_show.php | 52 +- codepot/src/config.php.in | 4 +- codepot/src/css/Makefile.in | 4 + codepot/src/css/images/Makefile.in | 4 + codepot/src/index.php | 41 + codepot/src/js/Makefile.in | 4 + codepot/src/js/prettify/Makefile.in | 4 + codepot/src/system/Makefile.in | 4 + codepot/src/system/cache/Makefile.in | 4 + codepot/src/system/codeigniter/Makefile.in | 4 + codepot/src/system/database/Makefile.in | 4 + .../src/system/database/drivers/Makefile.in | 4 + .../system/database/drivers/mssql/Makefile.in | 4 + .../system/database/drivers/mysql/Makefile.in | 4 + .../database/drivers/mysqli/Makefile.in | 4 + .../system/database/drivers/oci8/Makefile.in | 4 + .../system/database/drivers/odbc/Makefile.in | 4 + .../database/drivers/postgre/Makefile.in | 4 + .../database/drivers/sqlite/Makefile.in | 4 + codepot/src/system/fonts/Makefile.in | 4 + codepot/src/system/helpers/Makefile.in | 4 + codepot/src/system/language/Makefile.in | 4 + .../src/system/language/english/Makefile.in | 4 + .../src/system/language/korean/Makefile.in | 4 + codepot/src/system/libraries/Makefile.in | 4 + codepot/src/system/logs/Makefile.in | 4 + codepot/src/system/plugins/Makefile.in | 4 + codepot/src/system/scaffolding/Makefile.in | 4 + .../src/system/scaffolding/images/Makefile.in | 4 + .../src/system/scaffolding/views/Makefile.in | 4 + 105 files changed, 6965 insertions(+), 699 deletions(-) create mode 100755 codepot/pecl-svn/CREDITS create mode 100755 codepot/pecl-svn/EXPERIMENTAL create mode 100644 codepot/pecl-svn/Makefile.am create mode 100644 codepot/pecl-svn/Makefile.in create mode 100644 codepot/pecl-svn/README create mode 100644 codepot/pecl-svn/TODO create mode 100755 codepot/pecl-svn/config.m4 create mode 100755 codepot/pecl-svn/config.w32 create mode 100755 codepot/pecl-svn/examples/hook_copycommit.php create mode 100755 codepot/pecl-svn/examples/hook_emailcommit.php create mode 100644 codepot/pecl-svn/package.xml create mode 100755 codepot/pecl-svn/php_svn.h create mode 100755 codepot/pecl-svn/svn.c create mode 100644 codepot/pecl-svn/svn.ini diff --git a/codepot/DEBIAN/Makefile.in b/codepot/DEBIAN/Makefile.in index c9f6eadd..139b6245 100644 --- a/codepot/DEBIAN/Makefile.in +++ b/codepot/DEBIAN/Makefile.in @@ -143,6 +143,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PHPEXTDIR = @PHPEXTDIR@ +PHPEXTINIDIR = @PHPEXTINIDIR@ PREFIX = @PREFIX@ RM = @RM@ RMDIR = @RMDIR@ @@ -186,6 +188,8 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +phpextdir = @phpextdir@ +phpextinidir = @phpextinidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ diff --git a/codepot/Makefile.am b/codepot/Makefile.am index 5def2be7..89cd4d38 100644 --- a/codepot/Makefile.am +++ b/codepot/Makefile.am @@ -1,10 +1,13 @@ ACLOCAL_AMFLAGS = -I ac/m4 AUTOMAKE_OPTION = foreign -SUBDIRS = etc src sbin +SUBDIRS = etc src sbin pecl-svn EXTRA_DIST = README mkmf.sh DEBIAN +PHP_PACKAGE_NAME ?= php +TARGET_ARCH ?= $(shell uname -m) + install-data-hook: $(INSTALL) -d "$(DESTDIR)@DEPOTDIR@" $(INSTALL) -d "$(DESTDIR)@DEPOTDIR@/svnrepo" @@ -26,6 +29,7 @@ uninstall-hook: distclean-local: $(RM) -r autom4te.cache config.h.in~ "$(PACKAGE)-$(VERSION)" + deb: dist-gzip tar -zxvf "$(PACKAGE)-$(VERSION).tar.gz" cd "$(PACKAGE)-$(VERSION)"; ./configure \ @@ -52,4 +56,4 @@ rpm: dist mkdir -p "@abs_top_builddir@/RPM/SRPMS" mkdir -p "@abs_top_builddir@/RPM/RPMS" cp codepot-@VERSION@.tar.gz "@abs_top_builddir@/RPM/SOURCES" - rpmbuild --define "_topdir @abs_top_builddir@/RPM" -ba codepot.spec --target noarch + rpmbuild --define "_topdir @abs_top_builddir@/RPM" --define "php_package_name $(PHP_PACKAGE_NAME)" -ba codepot.spec --target="$(TARGET_ARCH)" diff --git a/codepot/Makefile.in b/codepot/Makefile.in index 53c3df6d..32c60ed5 100644 --- a/codepot/Makefile.in +++ b/codepot/Makefile.in @@ -168,6 +168,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PHPEXTDIR = @PHPEXTDIR@ +PHPEXTINIDIR = @PHPEXTINIDIR@ PREFIX = @PREFIX@ RM = @RM@ RMDIR = @RMDIR@ @@ -211,6 +213,8 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +phpextdir = @phpextdir@ +phpextinidir = @phpextinidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -225,7 +229,7 @@ top_srcdir = @top_srcdir@ wwwdir = @wwwdir@ ACLOCAL_AMFLAGS = -I ac/m4 AUTOMAKE_OPTION = foreign -SUBDIRS = etc src sbin +SUBDIRS = etc src sbin pecl-svn EXTRA_DIST = README mkmf.sh DEBIAN all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -734,6 +738,9 @@ uninstall-am: uninstall-hook +PHP_PACKAGE_NAME ?= php +TARGET_ARCH ?= $(shell uname -m) + install-data-hook: $(INSTALL) -d "$(DESTDIR)@DEPOTDIR@" $(INSTALL) -d "$(DESTDIR)@DEPOTDIR@/svnrepo" @@ -781,7 +788,7 @@ rpm: dist mkdir -p "@abs_top_builddir@/RPM/SRPMS" mkdir -p "@abs_top_builddir@/RPM/RPMS" cp codepot-@VERSION@.tar.gz "@abs_top_builddir@/RPM/SOURCES" - rpmbuild --define "_topdir @abs_top_builddir@/RPM" -ba codepot.spec --target noarch + rpmbuild --define "_topdir @abs_top_builddir@/RPM" --define "php_package_name $(PHP_PACKAGE_NAME)" -ba codepot.spec --target="$(TARGET_ARCH)" # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/codepot/README b/codepot/README index e4e20fad..3368585f 100644 --- a/codepot/README +++ b/codepot/README @@ -3,30 +3,110 @@ CODEPOT Codepot is a simple web-based source code manager. It incorporates the subversion revision control system and wiki-based documentation, and supports - authentication via LDAP. + authentication via LDAP or DBMS. -INSTALLATION +INSTALLATION ON CENTOS A RPM package is provided for RedHat/CentOS Linux. The RPM package specifies dependency which must be met prior to or at the same time as the installation - of the rpm package. + of the rpm package. Some required packages are available in RPMforge. You may + have to add the RPMforge repository for automatic installation with yum. - rpm -ivh codepot-X.X.X-X.noarch.rpm + $ rpm -ivh codepot-X.X.X-Y.Y.Y.Y.rpm - You can use the yum utility to be hassle-free instead. + You can use the yum utility to be hassle-free instead. However, some required + packages are not available in the base CentOS repository but in the RPMforge + repository. You may be required to add the RPMforge repository to the system. + View http://wiki.centos.org/AdditionalResources/Repositories/RPMForge for + RPMforge set-up. - yum localinstall --nogpgcheck codepot-X.X.X-X.noarch.rpm + $ yum localinstall --nogpgcheck codepot-X.X.X-Y.Y.Y.Y.rpm - You should perform the following tasks after the RPM installation. + Once you have all required package installed, you can proceed to configure + the system. The following steps shown assume the default installation of + CentOS 5. - * Initialize the mysql database using /etc/codepot/codepot.mysql. - * Add the following switch to /etc/httpd/conf.d/perl.conf - PerlSwitches -Mlib=/etc/codepot/perl - * Configure /etc/httpd/conf.d/codepot.conf - * Configure /etc/codepot/codepot.ini - * Restart httpd + X.X.X is the version number and Y.Y.Y.Y is the release number. For example, + to install Codepot 0.2.0 for a 32-bit x86 CentOS 5 server running PHP 5.3, + you should get the RPM package file - codepot-0.2.0-php53.1.el5.i686.rpm. + + 1. Add the following line to /etc/httpd/conf.d/perl.conf. It must be placed + after 'LoadModule perl_module modules/mod_perl.so'. + + PerlSwitches -Mlib=/etc/codepot/perl + + 2. Customize the Subversion WebDAV access in /etc/httpd/conf.d/codepot.conf + which the RPM package copies from /etc/codepot/codepot.http upon fresh + installation. You can skip this step if you don't need any customizations. + + 3. Create a database named 'codepot' into the running MySQL server. The + schema is defined in /etc/codepot/codepot.mysql. You can execute the following + in the MySQL command prompt. + + mysql> create database codepot; + mysql> use codepot; + mysql> source /etc/codepot/codepot.mysql; + + 4. Customize various configuration items in /etc/codepot/codepot.ini. + Set all items beginning with database_ to match the database settings. + Customize the values to match your system database. + + database_hostname = "localhost" + database_username = "root" + database_password = "" + database_name = "codepot" + database_driver = "mysql" + database_prefix = "" + + 5. Add a local user using the 'codepot-user' command. This command is used + to add a user to the database and a user entry added is effective if codepot + is configured to use 'DbLoginModel'. You can change it by chaning the value + of 'login_mode' in /etc/codepot/codepot.ini. + + $ codepot-user add username password username@your.domain + + 6. Enable the user added. - Here is how to install Codepot into the standard locations under Ubuntu Linux. + $ codepot-user enable username + + 7. Optionally, you can set this user to be a system administrator + in /etc/codepot/codepot.ini. + + sysadmin_userids = "username" + + 8. If you don't have the right subversion extension for PHP installed, you can + install the codepot-peclsvn package. Codepot requires the 'svn.so' extension + built of at least r333800 from http://svn.php.net/repository/pecl/svn/trunk. + + $ rpm -ivh codepot-peclsvn-X.X.X-Y.Y.Y.Y.rpm + + 9. If you have SELinux on in the enforcing mode, check if the data directories + used by Codepot has the right context set. The 'httpd_sys_content_t' context + type should be set. The Codepot RPM package sets the context type upon fresh + installation only. + + $ ls -Zd /var/lib/codepot + drwxr-xr-x root root user_u:object_r:httpd_sys_content_t /var/lib/codepot + + $ ls -Z /var/lib/codepot + drwxr-xr-x apache apache system_u:object_r:httpd_sys_content_t attachments + drwxr-xr-x apache apache system_u:object_r:httpd_sys_content_t files + drwxr-xr-x apache apache system_u:object_r:httpd_sys_content_t svnrepo + drwxr-xr-x apache apache system_u:object_r:httpd_sys_content_t usericons + + $ ls -lZd /var/cache/codepot + drwxr-xr-x apache apache system_u:object_r:httpd_sys_content_t /var/cache/codepot + + 10. Restart httpd. + + $ service httpd restart + + 11. Access http://your-server/codepot/ + + +INSTALLATION ON DEBIAN + + Here is how to install Codepot into the standard locations under Debian Linux. * Install required packages. $ sudo apt-get install subversion @@ -78,6 +158,7 @@ INSTALLATION Note that make-ssl-cert is provided by the ssl-cert package. + LICENSE This software is licensed under the GNU General Public License. diff --git a/codepot/codepot.spec.in b/codepot/codepot.spec.in index 0d8467f5..f00c8983 100644 --- a/codepot/codepot.spec.in +++ b/codepot/codepot.spec.in @@ -1,34 +1,55 @@ %define _prefix /usr %define _sysconfdir /etc +%if %{?php_package_name:0}%{!?php_package_name:1} +# if php_package_name is not defined +%define php_package_name php +%endif + Summary: Codepot code repository manager Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ -Release: 1 +Release: %{php_package_name}.1%{?dist} License: GPL Group: Applications/Utilities +#BuildArch: noarch Source0: %{name}-%{version}.tar.gz -Requires: httpd php php-ldap php-mysql php-gd subversion subversion-perl mod_dav_svn mod_perl perl perl-LDAP perl-Config-Simple perl-URI perl-DBI perl-Digest-SHA1 +Requires: httpd %{php_package_name} %{php_package_name}-ldap %{php_package_name}-mysql %{php_package_name}-gd subversion subversion-perl mod_dav_svn mod_perl perl perl-LDAP perl-Config-Simple perl-URI perl-DBI perl-Digest-SHA1 +# %{php_package_name}-pecl-svn > 1.2.0 -#BuildRequires: +BuildRequires: subversion-devel neon-devel %{php_package_name}-devel BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Codepot code repository manager +%package peclsvn +Summary: PHP Subversion extension +Group: Development/Languages +#BuildArch: %{_target_platform} +Requires: @PACKAGE_NAME@ = %{PACKAGE_VERSION} +Conflicts: %{php_package_name}-pecl-svn + +%description peclsvn +This package contains svn.so for PHP. You can install this package +if your system doesn't have a proper Subversion extenstion for PHP. + %prep %setup -q %build ./configure \ --prefix=/usr \ + --libdir=%{_libdir} \ --sysconfdir=/etc \ --with-wwwdir=/var/www/html/codepot \ --with-cfgdir=/etc/codepot \ --with-depotdir=/var/lib/codepot \ --with-logdir=/var/log/codepot \ - --with-cachedir=/var/cache/codepot + --with-cachedir=/var/cache/codepot \ + --with-phpextdir=%{_libdir}/php/modules \ + --with-phpextinidir=%{_sysconfdir}/php.d make %install @@ -69,13 +90,23 @@ rm -rf $RPM_BUILD_ROOT %dir /var/log/codepot %dir /var/cache/codepot +%files peclsvn +%{_libdir}/php/modules/svn.so +%config(noreplace) %{_sysconfdir}/php.d/svn.ini + %pre exit 0 %post -[ $1 -eq 0 ] && { +[ $1 -eq 1 ] && { + # Fresh installation. + # install the httpd configuration file for the first installation install -D -m 0644 %{_sysconfdir}/codepot/codepot.httpd %{_sysconfdir}/httpd/conf.d/codepot.conf + + # change the selinux context on data directories + chcon -Rv --type=httpd_sys_content_t /var/lib/codepot >/dev/null 2>&1 + chcon -Rv --type=httpd_sys_content_t /var/cache/codepot >/dev/null 2>&1 } exit 0 @@ -84,6 +115,7 @@ exit 0 %postun [ $1 -eq 0 ] && { + # Uninstallation rm -f %{_sysconfdir}/httpd/conf.d/codepot.conf } exit 0 diff --git a/codepot/configure b/codepot/configure index af156a1c..440a484e 100755 --- a/codepot/configure +++ b/codepot/configure @@ -1,8 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for codepot 0.1.2. -# -# Report bugs to >. +# Generated by GNU Autoconf 2.69 for codepot 0.2.0. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -265,8 +263,7 @@ fi $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and Hyung-Hwan Chung -$0: about your system, + $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, $0: including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." @@ -579,13 +576,15 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='codepot' PACKAGE_TARNAME='codepot' -PACKAGE_VERSION='0.1.2' -PACKAGE_STRING='codepot 0.1.2' -PACKAGE_BUGREPORT='Hyung-Hwan Chung ' -PACKAGE_URL='http://www.abiyo.net/codepot' +PACKAGE_VERSION='0.2.0' +PACKAGE_STRING='codepot 0.2.0' +PACKAGE_BUGREPORT='' +PACKAGE_URL='http://code.abiyo.net/@codepot' ac_subst_vars='LTLIBOBJS LIBOBJS +PHPEXTINIDIR +PHPEXTDIR CACHEDIR LOGDIR WWWDIR @@ -601,6 +600,8 @@ DATAROOTDIR LIBEXECDIR LIBDIR PREFIX +phpextinidir +phpextdir cachedir logdir wwwdir @@ -680,6 +681,8 @@ with_cfgdir with_wwwdir with_logdir with_cachedir +with_phpextdir +with_phpextinidir ' ac_precious_vars='build_alias host_alias @@ -1224,7 +1227,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures codepot 0.1.2 to adapt to many kinds of systems. +\`configure' configures codepot 0.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1290,7 +1293,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of codepot 0.1.2:";; + short | recursive ) echo "Configuration of codepot 0.2.0:";; esac cat <<\_ACEOF @@ -1303,9 +1306,11 @@ Optional Packages: --with-wwwdir directory for www document files --with-logdir directory for log files --with-cachedir directory for cache files + --with-phpextdir directory where a php extension file is stored + --with-phpextinidir directory where a php extension is enabled -Report bugs to >. -codepot home page: . +Report bugs to the package provider. +codepot home page: . _ACEOF ac_status=$? fi @@ -1368,7 +1373,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -codepot configure 0.1.2 +codepot configure 0.2.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1385,7 +1390,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by codepot $as_me 0.1.2, which was +It was created by codepot $as_me 0.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2204,7 +2209,7 @@ fi # Define the identity of the package. PACKAGE='codepot' - VERSION='0.1.2' + VERSION='0.2.0' cat >>confdefs.h <<_ACEOF @@ -2763,6 +2768,26 @@ fi cachedir=$cachedir +phpextdir="${libdir}/php/modules" + +# Check whether --with-phpextdir was given. +if test "${with_phpextdir+set}" = set; then : + withval=$with_phpextdir; phpextdir=$withval +fi + +phpextdir=$phpextdir + + +phpextinidir="${sysconfdir}/php.d" + +# Check whether --with-phpextinidir was given. +if test "${with_phpextinidir+set}" = set; then : + withval=$with_phpextinidir; phpextinidir=$withval +fi + +phpextinidir=$phpextinidir + + EXP_VAR=PREFIX FROM_VAR=$prefix @@ -3185,8 +3210,64 @@ cachedir=$cachedir exec_prefix=$exec_prefix_save + EXP_VAR=PHPEXTDIR + FROM_VAR=$phpextdir -ac_config_files="$ac_config_files Makefile codepot.spec etc/Makefile etc/codepot.ini etc/codepot.a2ldap etc/codepot.httpd etc/pre-commit etc/start-commit etc/post-commit etc/pre-revprop-change etc/post-revprop-change sbin/Makefile sbin/codepot-user DEBIAN/Makefile DEBIAN/control DEBIAN/postinst DEBIAN/postrm src/config.php src/codepot/config/Makefile src/codepot/controllers/Makefile src/codepot/errors/Makefile src/codepot/helpers/Makefile src/codepot/hooks/Makefile src/codepot/language/english/Makefile src/codepot/language/indonesian/Makefile src/codepot/language/korean/Makefile src/codepot/language/Makefile src/codepot/libraries/Makefile src/codepot/models/Makefile src/codepot/views/Makefile src/codepot/Makefile src/css/images/Makefile src/css/Makefile src/js/prettify/Makefile src/js/Makefile src/system/cache/Makefile src/system/codeigniter/Makefile src/system/database/drivers/mssql/Makefile src/system/database/drivers/mysql/Makefile src/system/database/drivers/mysqli/Makefile src/system/database/drivers/oci8/Makefile src/system/database/drivers/odbc/Makefile src/system/database/drivers/postgre/Makefile src/system/database/drivers/sqlite/Makefile src/system/database/drivers/Makefile src/system/database/Makefile src/system/fonts/Makefile src/system/helpers/Makefile src/system/language/english/Makefile src/system/language/korean/Makefile src/system/language/Makefile src/system/libraries/Makefile src/system/logs/Makefile src/system/plugins/Makefile src/system/scaffolding/images/Makefile src/system/scaffolding/views/Makefile src/system/scaffolding/Makefile src/system/Makefile src/Makefile" + prefix_save=$prefix + exec_prefix_save=$exec_prefix + + if test "x$prefix" = "xNONE"; then + prefix="$ac_default_prefix" + fi + if test "x$exec_prefix" = "xNONE"; then + exec_prefix=$prefix + fi + + full_var="$FROM_VAR" + while true; do + new_full_var="`eval echo $full_var`" + if test "x$new_full_var" = "x$full_var"; then break; fi + full_var=$new_full_var + done + + full_var=$new_full_var + PHPEXTDIR="$full_var" + + + prefix=$prefix_save + exec_prefix=$exec_prefix_save + + + EXP_VAR=PHPEXTINIDIR + FROM_VAR=$phpextinidir + + prefix_save=$prefix + exec_prefix_save=$exec_prefix + + if test "x$prefix" = "xNONE"; then + prefix="$ac_default_prefix" + fi + if test "x$exec_prefix" = "xNONE"; then + exec_prefix=$prefix + fi + + full_var="$FROM_VAR" + while true; do + new_full_var="`eval echo $full_var`" + if test "x$new_full_var" = "x$full_var"; then break; fi + full_var=$new_full_var + done + + full_var=$new_full_var + PHPEXTINIDIR="$full_var" + + + prefix=$prefix_save + exec_prefix=$exec_prefix_save + + + +ac_config_files="$ac_config_files Makefile codepot.spec etc/Makefile etc/codepot.ini etc/codepot.a2ldap etc/codepot.httpd etc/pre-commit etc/start-commit etc/post-commit etc/pre-revprop-change etc/post-revprop-change sbin/Makefile sbin/codepot-user pecl-svn/Makefile DEBIAN/Makefile DEBIAN/control DEBIAN/postinst DEBIAN/postrm src/config.php src/codepot/config/Makefile src/codepot/controllers/Makefile src/codepot/errors/Makefile src/codepot/helpers/Makefile src/codepot/hooks/Makefile src/codepot/language/english/Makefile src/codepot/language/indonesian/Makefile src/codepot/language/korean/Makefile src/codepot/language/Makefile src/codepot/libraries/Makefile src/codepot/models/Makefile src/codepot/views/Makefile src/codepot/Makefile src/css/images/Makefile src/css/Makefile src/js/prettify/Makefile src/js/Makefile src/system/cache/Makefile src/system/codeigniter/Makefile src/system/database/drivers/mssql/Makefile src/system/database/drivers/mysql/Makefile src/system/database/drivers/mysqli/Makefile src/system/database/drivers/oci8/Makefile src/system/database/drivers/odbc/Makefile src/system/database/drivers/postgre/Makefile src/system/database/drivers/sqlite/Makefile src/system/database/drivers/Makefile src/system/database/Makefile src/system/fonts/Makefile src/system/helpers/Makefile src/system/language/english/Makefile src/system/language/korean/Makefile src/system/language/Makefile src/system/libraries/Makefile src/system/logs/Makefile src/system/plugins/Makefile src/system/scaffolding/images/Makefile src/system/scaffolding/views/Makefile src/system/scaffolding/Makefile src/system/Makefile src/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -3695,7 +3776,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by codepot $as_me 0.1.2, which was +This file was extended by codepot $as_me 0.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3751,14 +3832,14 @@ $config_files Configuration headers: $config_headers -Report bugs to >. -codepot home page: ." +Report bugs to the package provider. +codepot home page: ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -codepot config.status 0.1.2 +codepot config.status 0.2.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -3896,6 +3977,7 @@ do "etc/post-revprop-change") CONFIG_FILES="$CONFIG_FILES etc/post-revprop-change" ;; "sbin/Makefile") CONFIG_FILES="$CONFIG_FILES sbin/Makefile" ;; "sbin/codepot-user") CONFIG_FILES="$CONFIG_FILES sbin/codepot-user" ;; + "pecl-svn/Makefile") CONFIG_FILES="$CONFIG_FILES pecl-svn/Makefile" ;; "DEBIAN/Makefile") CONFIG_FILES="$CONFIG_FILES DEBIAN/Makefile" ;; "DEBIAN/control") CONFIG_FILES="$CONFIG_FILES DEBIAN/control" ;; "DEBIAN/postinst") CONFIG_FILES="$CONFIG_FILES DEBIAN/postinst" ;; diff --git a/codepot/configure.ac b/codepot/configure.ac index 66a26f97..0d693c2a 100644 --- a/codepot/configure.ac +++ b/codepot/configure.ac @@ -1,7 +1,7 @@ dnl AC_PREREQ(2.59) -AC_INIT([codepot],[0.1.2],[Hyung-Hwan Chung ],,[http://www.abiyo.net/codepot]) +AC_INIT([codepot],[0.2.0],,,[http://code.abiyo.net/@codepot]) AC_CONFIG_HEADER([./config.h]) AC_CONFIG_AUX_DIR([ac/aux]) AC_CONFIG_MACRO_DIR([ac/m4]) @@ -63,6 +63,22 @@ AC_ARG_WITH(cachedir, [cachedir=$withval]) AC_SUBST(cachedir, $cachedir) +phpextdir="${libdir}/php/modules" +AC_ARG_WITH(phpextdir, + AC_HELP_STRING( + [--with-phpextdir], + [directory where a php extension file is stored]), + [phpextdir=$withval]) +AC_SUBST(phpextdir, $phpextdir) + +phpextinidir="${sysconfdir}/php.d" +AC_ARG_WITH(phpextinidir, + AC_HELP_STRING( + [--with-phpextinidir], + [directory where a php extension is enabled]), + [phpextinidir=$withval]) +AC_SUBST(phpextinidir, $phpextinidir) + AS_AC_EXPAND(PREFIX, $prefix) AS_AC_EXPAND(LIBDIR, $libdir) AS_AC_EXPAND(LIBEXECDIR, $libexecdir) @@ -74,11 +90,13 @@ AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir) AS_AC_EXPAND(BINDIR, $bindir) AS_AC_EXPAND(SBINDIR, $sbindir) -AS_AC_EXPAND(DEPOTDIR, $depotdir) -AS_AC_EXPAND(CFGDIR, $cfgdir) -AS_AC_EXPAND(WWWDIR, $wwwdir) -AS_AC_EXPAND(LOGDIR, $logdir) -AS_AC_EXPAND(CACHEDIR, $cachedir) +AS_AC_EXPAND(DEPOTDIR, $depotdir) +AS_AC_EXPAND(CFGDIR, $cfgdir) +AS_AC_EXPAND(WWWDIR, $wwwdir) +AS_AC_EXPAND(LOGDIR, $logdir) +AS_AC_EXPAND(CACHEDIR, $cachedir) +AS_AC_EXPAND(PHPEXTDIR, $phpextdir) +AS_AC_EXPAND(PHPEXTINIDIR, $phpextinidir) AC_CONFIG_FILES([ @@ -95,6 +113,7 @@ AC_CONFIG_FILES([ etc/post-revprop-change sbin/Makefile sbin/codepot-user + pecl-svn/Makefile DEBIAN/Makefile DEBIAN/control DEBIAN/postinst diff --git a/codepot/etc/Makefile.in b/codepot/etc/Makefile.in index ad609d99..0df44bc6 100644 --- a/codepot/etc/Makefile.in +++ b/codepot/etc/Makefile.in @@ -148,6 +148,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PHPEXTDIR = @PHPEXTDIR@ +PHPEXTINIDIR = @PHPEXTINIDIR@ PREFIX = @PREFIX@ RM = @RM@ RMDIR = @RMDIR@ @@ -191,6 +193,8 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +phpextdir = @phpextdir@ +phpextinidir = @phpextinidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ diff --git a/codepot/etc/codepot.ini.in b/codepot/etc/codepot.ini.in index 8cb462b8..ef25e06e 100644 --- a/codepot/etc/codepot.ini.in +++ b/codepot/etc/codepot.ini.in @@ -98,7 +98,7 @@ api_base_url = "http://127.0.0.1" svn_base_url = "${REQUEST_PROTOCOL}://${HTTP_HOST}/svn" ;------------------------------------------------------------------------------ -; Login model to use. +; Login model to use. LdapLoginModel or DbLoginModel. ;------------------------------------------------------------------------------ #login_model = "LdapLoginModel" login_model = "DbLoginModel" @@ -203,7 +203,9 @@ signin_for_code_search = "yes" ;------------------------------------------------------------------------------ ; customized footer ;------------------------------------------------------------------------------ -; Leave this empty for the default footer message +; Leave this empty for the default footer message. You can use a HTML tag as +; well as a plain text. For example, +; footer = "Code Repository" ;------------------------------------------------------------------------------ footer = "" @@ -214,6 +216,13 @@ footer = "" ;------------------------------------------------------------------------------ cloc_command_path = "@CFGDIR@/cloc.pl" +;------------------------------------------------------------------------------ +; List of README files to show in the code folder view. +; The first file found is shown. You can specify multiple file name +; separated by a comma. +;------------------------------------------------------------------------------ +code_folder_readme = "README.wiki,README.txt,README" + ;------------------------------------------------------------------------------ ; Subversion read access is limited to the specified user type. The types ; include anonymous, authenticated, member. This applies to a public project @@ -240,8 +249,7 @@ svn_restriction_allowed_subdir_depth_min = 0 svn_restriction_allowed_subdir_depth_max = 0 ;------------------------------------------------------------------------------ -; List of README files to show in the code folder view. -; The first file found is shown. You can specify multiple file name -; separated by a comma. +; Command separated list of user names who can execute /usr/sbin/codepot-user. +; Set it to an empty string to allow all users. ;------------------------------------------------------------------------------ -code_folder_readme = "README.wiki,README.txt,README"; +codepot_user_executor = "root" diff --git a/codepot/etc/codepot.mysql b/codepot/etc/codepot.mysql index f8c249ad..d199150a 100644 --- a/codepot/etc/codepot.mysql +++ b/codepot/etc/codepot.mysql @@ -1,5 +1,7 @@ - -USE codepot; +-- --------------------------------------------------------- +-- This file is the Codepot database schema file for MySQL. +-- Note this file doesn't mandate which database to use. +-- --------------------------------------------------------- CREATE TABLE site ( id VARCHAR(32) PRIMARY KEY, diff --git a/codepot/pecl-svn/CREDITS b/codepot/pecl-svn/CREDITS new file mode 100755 index 00000000..0e90c7e4 --- /dev/null +++ b/codepot/pecl-svn/CREDITS @@ -0,0 +1,2 @@ +svn +Alan Knowles, Wez Furlong, Scott MacVicar diff --git a/codepot/pecl-svn/EXPERIMENTAL b/codepot/pecl-svn/EXPERIMENTAL new file mode 100755 index 00000000..e69de29b diff --git a/codepot/pecl-svn/Makefile.am b/codepot/pecl-svn/Makefile.am new file mode 100644 index 00000000..db986d39 --- /dev/null +++ b/codepot/pecl-svn/Makefile.am @@ -0,0 +1,22 @@ +EXTRA_DIST = config.m4 svn.c php_svn.h svn.ini + +all-local: + mkdir -p @abs_builddir@/pecl + cp -pf @abs_srcdir@/svn.c @abs_builddir@/pecl/ + cp -pf @abs_srcdir@/php_svn.h @abs_builddir@/pecl/ + cp -pf @abs_srcdir@/config.m4 @abs_builddir@/pecl/ + cd @abs_builddir@/pecl/; phpize + cd @abs_builddir@/pecl/; ./configure + cd @abs_builddir@/pecl/; make + +clean-local: + -rm -rf @abs_builddir@/pecl + +install-exec-hook: + $(INSTALL) -D @abs_builddir@/pecl/.libs/svn.so $(DESTDIR)@PHPEXTDIR@/svn.so + +install-data-hook: + $(INSTALL) -D @abs_srcdir@/svn.ini $(DESTDIR)@PHPEXTINIDIR@/svn.ini + +uninstall-hook: + -rm -f @PHPEXTDIR@/svn.so $(DESTDIR)@PHPEXTINIDIR@/svn.ini diff --git a/codepot/pecl-svn/Makefile.in b/codepot/pecl-svn/Makefile.in new file mode 100644 index 00000000..05499356 --- /dev/null +++ b/codepot/pecl-svn/Makefile.in @@ -0,0 +1,384 @@ +# Makefile.in generated by automake 1.11.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +subdir = pecl-svn +DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/ac/m4/as-ac-expand.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/./config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BINDIR = @BINDIR@ +CACHEDIR = @CACHEDIR@ +CFGDIR = @CFGDIR@ +CYGPATH_W = @CYGPATH_W@ +DATADIR = @DATADIR@ +DATAROOTDIR = @DATAROOTDIR@ +DEFS = @DEFS@ +DEPOTDIR = @DEPOTDIR@ +DOCDIR = @DOCDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LIBDIR = @LIBDIR@ +LIBEXECDIR = @LIBEXECDIR@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LOCALSTATEDIR = @LOCALSTATEDIR@ +LOGDIR = @LOGDIR@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PHPEXTDIR = @PHPEXTDIR@ +PHPEXTINIDIR = @PHPEXTINIDIR@ +PREFIX = @PREFIX@ +RM = @RM@ +RMDIR = @RMDIR@ +SBINDIR = @SBINDIR@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SYSCONFDIR = @SYSCONFDIR@ +VERSION = @VERSION@ +WWWDIR = @WWWDIR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +am__leading_dot = @am__leading_dot@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build_alias = @build_alias@ +builddir = @builddir@ +cachedir = @cachedir@ +cfgdir = @cfgdir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +depotdir = @depotdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host_alias = @host_alias@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +logdir = @logdir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +phpextdir = @phpextdir@ +phpextinidir = @phpextinidir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +wwwdir = @wwwdir@ +EXTRA_DIST = config.m4 svn.c php_svn.h svn.ini +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pecl-svn/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign pecl-svn/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile all-local +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-local mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-exec-hook +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook +.MAKE: install-am install-data-am install-exec-am install-strip \ + uninstall-am + +.PHONY: all all-am all-local check check-am clean clean-generic \ + clean-local distclean distclean-generic distdir dvi dvi-am \ + html html-am info info-am install install-am install-data \ + install-data-am install-data-hook install-dvi install-dvi-am \ + install-exec install-exec-am install-exec-hook install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-hook + + +all-local: + mkdir -p @abs_builddir@/pecl + cp -pf @abs_srcdir@/svn.c @abs_builddir@/pecl/ + cp -pf @abs_srcdir@/php_svn.h @abs_builddir@/pecl/ + cp -pf @abs_srcdir@/config.m4 @abs_builddir@/pecl/ + cd @abs_builddir@/pecl/; phpize + cd @abs_builddir@/pecl/; ./configure + cd @abs_builddir@/pecl/; make + +clean-local: + -rm -rf @abs_builddir@/pecl + +install-exec-hook: + $(INSTALL) -D @abs_builddir@/pecl/.libs/svn.so $(DESTDIR)@PHPEXTDIR@/svn.so + +install-data-hook: + $(INSTALL) -D @abs_srcdir@/svn.ini $(DESTDIR)@PHPEXTINIDIR@/svn.ini + +uninstall-hook: + -rm -f @PHPEXTDIR@/svn.so $(DESTDIR)@PHPEXTINIDIR@/svn.ini + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/codepot/pecl-svn/README b/codepot/pecl-svn/README new file mode 100644 index 00000000..b7b86817 --- /dev/null +++ b/codepot/pecl-svn/README @@ -0,0 +1,9 @@ +This directory contains the source code of the PECL Subversion module. +The whole directory has been checked out using the following command +except the 'tests' subdirectory. + + svn checkout -r 333800 http://svn.php.net/repository/pecl/svn/trunk pecl-svn + +I include this PHP extension as its package which is new enough to support +Codepot is not widely available on many Linux distros. Codepot requires +pecl-svn r333800 at least. diff --git a/codepot/pecl-svn/TODO b/codepot/pecl-svn/TODO new file mode 100644 index 00000000..fba3ed0d --- /dev/null +++ b/codepot/pecl-svn/TODO @@ -0,0 +1,12 @@ +Functions that need to be added: +svn_merge +svn_propset +svn_url_from_path +svn_uuid_from_url +svn_uuid_from_path + + +New 1.5 functions that need to be added: +svn_add_to_changelist +svn_get_changelists +svn_remove_from_changelists diff --git a/codepot/pecl-svn/config.m4 b/codepot/pecl-svn/config.m4 new file mode 100755 index 00000000..258f1ca4 --- /dev/null +++ b/codepot/pecl-svn/config.m4 @@ -0,0 +1,88 @@ +dnl $Id: config.m4 263540 2008-07-25 12:41:27Z tony2001 $ +dnl config.m4 for extension svn +dnl vim:se ts=2 sw=2 et: + +PHP_ARG_WITH(svn, for svn support, + +[ --with-svn=[/path/to/svn-prefix] Include svn support]) + +PHP_ARG_WITH(svn-apr, for specifying the location of apr for svn, + +[ --with-svn-apr=[/path/to/apr-prefix] Location of apr-1-config / apr-config]) + + +if test "$PHP_SVN" != "no"; then + + AC_MSG_CHECKING([for svn includes]) + for i in $PHP_SVN /usr/local /usr /opt /sw; do + if test -r $i/include/subversion-1/svn_client.h ; then + SVN_DIR=$i/include/subversion-1 + PHP_SVN_INCLUDES="-I$SVN_DIR" + PHP_SVN_LDFLAGS="-lsvn_client-1 -lsvn_fs-1 -lsvn_repos-1 -lsvn_subr-1" + SVN_VER_MAJOR=`grep '#define SVN_VER_MAJOR' $SVN_DIR/svn_version.h|$SED 's/#define SVN_VER_MAJOR[ \t]*//;s/[ \t]*$//'` + SVN_VER_MINOR=`grep '#define SVN_VER_MINOR' $SVN_DIR/svn_version.h|$SED 's/#define SVN_VER_MINOR[ \t]*//;s/[ \t]*$//'` + SVN_VER_PATCH=`grep '#define SVN_VER_PATCH' $SVN_DIR/svn_version.h|$SED 's/#define SVN_VER_PATCH[ \t]*//;s/[ \t]*$//'` + AC_MSG_RESULT(Found libsvn $SVN_VER_MAJOR.$SVN_VER_MINOR.$SVN_VER_PATCH) + break; + fi + done + + if test "$PHP_SVN_LDFLAGS" = ""; then + AC_MSG_ERROR([failed to find svn_client.h]) + fi + + dnl check SVN version, we need at least 1.3 + if test "$SVN_VER_MAJOR" -le 1 -a "$SVN_VER_MINOR" -le 3; then + AC_MSG_ERROR([minimum libsvn is 1.3]) + fi + + AC_MSG_CHECKING([for apr and apr-util]) + for i in $PHP_SVN_APR $PHP_SVN /usr/local /usr /opt /sw; do + dnl APR 1.0 tests + if test -r $i/bin/apr-1-config ; then + apr_config_path="$i/bin/apr-1-config" + break; + elif test -r $i/apache2/bin/apr-1-config ; then + apr_config_path="$i/apache2/bin/apr-1-config" + break; + elif test -r $i/apache/bin/apr-1-config ; then + apr_config_path="$i/apache/bin/apr-1-config" + break; + dnl APR 0.9 tests + elif test -r $i/bin/apr-config ; then + apr_config_path="$i/bin/apr-config" + break; + elif test -r $i/apache2/bin/apr-config ; then + apr_config_path="$i/apache2/bin/apr-config" + break; + elif test -r $i/apache/bin/apr-config ; then + apr_config_path="$i/apache/bin/apr-config" + break; + fi + done + + if test "$apr_config_path" = ""; then + AC_MSG_ERROR([failed to find apr-config / apr-1-config]) + fi + + APR_VERSION=`$apr_config_path --version` + APR_INCLUDES=`$apr_config_path --includes --cppflags` + APR_LDFLAGS=`$apr_config_path --link-ld` + + AC_MSG_RESULT(Found apr $APR_VERSION) + + PHP_SVN_INCLUDES="$PHP_SVN_INCLUDES $APR_INCLUDES" + PHP_SVN_LDFLAGS="$PHP_SVN_LDFLAGS $APR_LDFLAGS" + + echo libsvn includes: \"$PHP_SVN_INCLUDES\" + echo libsvn ldflags: \"$PHP_SVN_LDFLAGS\" + + AC_DEFINE(HAVE_SVNLIB,1,[ ]) + + INCLUDES="$INCLUDES $PHP_SVN_INCLUDES" + + PHP_EVAL_LIBLINE($PHP_SVN_LDFLAGS, SVN_SHARED_LIBADD) + PHP_SUBST(SVN_SHARED_LIBADD) + + PHP_NEW_EXTENSION(svn, svn.c, $ext_shared,,$PHP_SVN_INCLUDES) +fi diff --git a/codepot/pecl-svn/config.w32 b/codepot/pecl-svn/config.w32 new file mode 100755 index 00000000..c8932d61 --- /dev/null +++ b/codepot/pecl-svn/config.w32 @@ -0,0 +1,40 @@ +// $Id: config.w32 257431 2008-04-14 06:10:46Z alan_k $ +// vim:ft=javascript + + +ARG_WITH("svn", "for svn support", "no"); + +if (PHP_SVN != "no") { + if (CHECK_LIB("libsvn_client-1.lib", "svn", PHP_PHP_BUILD + "\\lib\\svn;" + PHP_SVN) && + CHECK_LIB("libsvn_subr-1.lib", "svn", PHP_PHP_BUILD + "\\lib\\svn;" + PHP_SVN) && + CHECK_LIB("libsvn_wc-1.lib", "svn", PHP_PHP_BUILD + "\\lib\\svn;" + PHP_SVN) && + CHECK_LIB("libsvn_delta-1.lib", "svn", PHP_PHP_BUILD + "\\lib\\svn;" + PHP_SVN) && + CHECK_LIB("libsvn_diff-1.lib", "svn", PHP_PHP_BUILD + "\\lib\\svn;" + PHP_SVN) && + CHECK_LIB("libsvn_ra-1.lib", "svn", PHP_PHP_BUILD + "\\lib\\svn;" + PHP_SVN) && + CHECK_LIB("libsvn_ra_dav-1.lib", "svn", PHP_PHP_BUILD + "\\lib\\svn;" + PHP_SVN) && + CHECK_LIB("libsvn_ra_local-1.lib", "svn", PHP_PHP_BUILD + "\\lib\\svn;" + PHP_SVN) && + CHECK_LIB("libsvn_ra_svn-1.lib", "svn", PHP_PHP_BUILD + "\\lib\\svn;" + PHP_SVN) && + CHECK_LIB("libsvn_fs-1.lib", "svn", PHP_PHP_BUILD + "\\lib\\svn;" + PHP_SVN) && + CHECK_LIB("libsvn_fs_fs-1.lib", "svn", PHP_PHP_BUILD + "\\lib\\svn;" + PHP_SVN) && + CHECK_LIB("libsvn_fs_base-1.lib", "svn", PHP_PHP_BUILD + "\\lib\\svn;" + PHP_SVN) && + CHECK_LIB("libsvn_repos-1.lib", "svn", PHP_PHP_BUILD + "\\lib\\svn;" + PHP_SVN) && + CHECK_HEADER_ADD_INCLUDE("svn_client.h", "CFLAGS_SVN", PHP_PHP_BUILD + "\\include\\svn") && + CHECK_HEADER_ADD_INCLUDE("libintl.h", "CFLAGS_SVN", PHP_PHP_BUILD + "\\include\\svn") && + CHECK_HEADER_ADD_INCLUDE("apr.h", "CFLAGS_SVN", PHP_PHP_BUILD + "\\include\\svn\\apr") && + CHECK_HEADER_ADD_INCLUDE("apr_xlate.h", "CFLAGS_SVN", PHP_PHP_BUILD + "\\include\\svn\\apr-util") && + CHECK_LIB("intl3_svn.lib", "svn", PHP_PHP_BUILD + "\\lib\\svn\\apr;" + PHP_SVN) && + CHECK_LIB("libdb43.lib", "svn", PHP_PHP_BUILD + "\\lib\\svn\\apr;" + PHP_SVN) && + CHECK_LIB("libneon.lib", "svn", PHP_PHP_BUILD + "\\lib\\svn\\neon;" + PHP_SVN) && + (CHECK_LIB("libapr.lib", "svn", PHP_PHP_BUILD + "\\lib\\svn\\apr;" + PHP_SVN) || + CHECK_LIB("libapr-1.lib", "svn", PHP_PHP_BUILD + "\\lib\\svn\\apr;" + PHP_SVN)) && + (CHECK_LIB("libaprutil.lib", "svn", PHP_PHP_BUILD + "\\lib\\svn\\apr-util;" + PHP_SVN) || + CHECK_LIB("libaprutil-1.lib", "svn", PHP_PHP_BUILD + "\\lib\\svn\\apr-util;" + PHP_SVN)) && + CHECK_LIB("xml.lib", "svn", PHP_PHP_BUILD + "\\lib\\svn\\apr-util;" + PHP_SVN) + ) { + EXTENSION("svn", "svn.c"); + AC_DEFINE('HAVE_SVN', 1, 'Have Subversion library'); + } else { + WARNING("svn not enabled; libraries and headers not found"); + } +} + diff --git a/codepot/pecl-svn/examples/hook_copycommit.php b/codepot/pecl-svn/examples/hook_copycommit.php new file mode 100755 index 00000000..cf0e19f4 --- /dev/null +++ b/codepot/pecl-svn/examples/hook_copycommit.php @@ -0,0 +1,108 @@ +> /tmp/svnlog + +*/ +dl('svn.so'); + +class Subversion_CopyCommit { + var $repos; + var $rev; + var $target; // where the copy goes + + + function start($args) { + print_r($args); + list( $cmd , $this->repos, $this->rev , $this->target ) = $args; + if (empty($this->target)) { + echo "NO TARGET !";exit; + } + if ($this->repos{0} == '/') { + $this->repos = 'file://'. $this->repos; + } + $this->rev = (int) $this->rev; + $ar = svn_log($this->repos, $this->rev, $this->rev-1, 0, SVN_DISCOVER_CHANGED_PATHS); + + + //print_R($ar); + foreach($ar[0]['paths'] as $action) { + $this->processAction($action); + } + } + + function processAction($action) + { + $this->debug("Action: {$action['action']} on {$action['path']}"); + switch($action['action']) { + case 'M': // modified + case 'A': // added. + + /* how to handle moves?? */ + + // is it a file or directory? + if ($this->isDir($action['path'])) { + if (!file_exists($this->target . $action['path'])) { + require_once 'System.php'; + System::mkdir(array('-p',$this->target . $action['path'])); + } + return; + } + + $this->writeFile($this->target.$action['path'], + svn_cat($this->repos . $action['path'],$this->rev)) ; + return; + + case 'D': // deleted. + if (file_exists($this->target . $action['path'])) { + require_once 'System.php'; + System::rm($this->target . $action['path']); + } + return; + + case 'R': // replaced???? + return; + } + } + var $dircache = array(); + + function isDir($path) + { + if (!isset($this->dircache[dirname($path)])) { + echo "SVN:LS ".$this->repos.dirname($path) ."\n"; + $p = strlen(dirname($path)) > 1 ? dirname($path) : ''; + $this->dircache[dirname($path)]= svn_ls($this->repos.$p,$this->rev); + } + $ar= $this->dircache[dirname($path)]; + //print_r($ar); + $match = basename($path); + foreach($ar as $info) { + if ($info['name'] != $match) { + continue; + } + return $info['type'] == 'dir'; + } + return false; + } + function writeFile($target,$data) + { + if (!file_exists(dirname($target))) { + require_once 'System.php'; + System::mkdir(array('-p', dirname($target))); + } + $fh = fopen($target,'w'); + fwrite($fh, $data); + fclose($fh); + } + + function debug($str) + { + echo $str."\n"; + } + +} +ini_set('memory_limit','64M'); +$x = new Subversion_CopyCommit; +$x->start($_SERVER['argv']); diff --git a/codepot/pecl-svn/examples/hook_emailcommit.php b/codepot/pecl-svn/examples/hook_emailcommit.php new file mode 100755 index 00000000..40c5e6df --- /dev/null +++ b/codepot/pecl-svn/examples/hook_emailcommit.php @@ -0,0 +1,157 @@ +> /tmp/svnlog + + Features: + - emails diff to email address + - adds error messages if it's a PHP file. + - sends popup messages to author on errors (using /hooks/popup.ini) + (use www.realpoup.it for winxp boxes) + + TODO: + - write bindings for diff so that it doesnt have to use the command line.. + + +*/ +dl('svn.so'); + +class Subversion_EmailCommit { + + var $repos; + var $rev; + var $email; //who gets the commit messages. + + function start($args) { + print_r($args); + list( $cmd , $this->repos, $this->rev , $this->email ) = $args; + + if ($this->repos{0} == '/') { + $this->repos = $this->repos = 'file://'. $this->repos; + } + + $this->rev = (int) $this->rev; + $last = $this->rev -1 ; + // techncially where the diff is!? + require_once 'System.php'; + $svn = System::which('svn','/usr/bin/svn'); + + $cmd = "$svn diff -r{$last}:{$this->rev} $this->repos"; + $this->log = svn_log($this->repos, $this->rev, $this->rev-1, 0, SVN_DISCOVER_CHANGED_PATHS); + + $syntax = $this->checkSyntax(); + //echo $cmd; + + + $diff = `$cmd`; + $diff = $this->log[0]['msg'] ."\n\n". $diff; + + + if ($syntax) { + $diff = $syntax ."\n\n". $diff; + } + + + $bits = explode('@', $this->email); + + $headers['From'] = "{$this->log[0]['author']} <{$this->log[0]['author']}@{$bits[1]}>"; + $headers['To'] = $this->email; + $headers['Subject'] = "[SVN {$bits[1]}] ". + ($syntax ? "ERROR!" : "") . + $this->getFilenames() . " ({$this->rev})"; + + $headers['Date'] = date('r'); + $headers['X-Mailer'] = 'svn hook'; + // Create the mail object using the Mail::factory method + require_once 'Mail.php'; + $mail_object =& Mail::factory('smtp', $params); + $mail_object->send($this->email, $headers, $diff); + + $this->sendPopup($syntax); + + } + + function sendPopup($syntax) { + if (!$syntax) { + + return; + } + if (substr($this->repos,0,strlen("file://")) != "file://") { + // echo "repos is not file://"; + return; + } + $file = substr($this->repos,strlen("file://")) . '/hooks/popup.ini'; + if (!file_exists($file)) { + // echo "$file does not exist"; + return; + } + $ar = parse_ini_file($file); + //print_r($ar); + if (!isset($ar[$this->log[0]['author']])) { + // no ip for this author. + echo "no match for author"; + return; + } + $ip = $ar[$this->log[0]['author']]; + $cmd = "/usr/bin/smbclient -M {$this->log[0]['author']} -I {$ip}"; + //echo $cmd; + $fh = popen($cmd,'w'); + fwrite($fh, $data); + // end + fwrite($fh,chr(04)); + fclose($fh); + } + + + + + function checkSyntax() + { + $ret = ''; + $ar = $this->log; + foreach($ar[0]['paths'] as $action) { + if (!in_array($action['action'],array('M','A'))) { + continue; + } + if (!preg_match('#\.php$#', $action['path'])) { + continue; + } + $tmp = ini_get('session.save_path') . '/'.uniqid('tmp_php.').'.php'; + + $this->writeFile($tmp , + svn_cat($this->repos . $action['path'],$this->rev)); + + $data = $data = `/usr/bin/php -l $tmp`; + unlink($tmp); + if (preg_match('/^No syntax errors/',$data)) { + continue; + } + $ret .= "Error in {$action['path']}\n".$data; + } + return strlen($ret) ? $ret : false; + + } + + function writeFile($target,$data) + { + $fh = fopen($target,'w'); + fwrite($fh, $data); + fclose($fh); + } + + function getFileNames() + { + $ar = $this->log; + if (count($ar[0]['paths']) > 1) { + return "Multiple Files"; + } + return $ar[0]['paths'][0]['path']; + } + +} +ini_set('memory_limit','64M'); +$x = new Subversion_EmailCommit; +$x->start($_SERVER['argv']); diff --git a/codepot/pecl-svn/package.xml b/codepot/pecl-svn/package.xml new file mode 100644 index 00000000..6f8ae8e0 --- /dev/null +++ b/codepot/pecl-svn/package.xml @@ -0,0 +1,350 @@ + + + svn + pecl.php.net + PHP Bindings for the Subversion Revision control system. + + + Bindings for the Subversion revision control system, providing a method for manipulating + a working copy or repository with PHP. + + + Scott MacVicar + scottmac + scottmac@php.net + yes + + + + Alan Knowles + alan_k + alan@akbkhome.com + yes + + + + Wez Furlong + wez + wez@omniti.com + no + + + + 2010-12-09 + + 1.0.2 + 1.0.0 + + + + stable + stable + + + PHP License + + +Minor bug fix / feature release + + Changes: + #60583 - compile failing due to missing definition of svn_version_t in newer releases of libsvn + #59976 (svn build fails on PHP5.4) + #15505 - warning on errors + ------ support for peg revisions in checkout, ls, log, blame, info, proplist, propget + extra error checks in checkout - thanks to Hyung-Hwan Chung + #22758 - support specifying revision in svn_copy (he dot chen at zte dot com dot cn) + #23649 - allow deletion of properties by using NULL as value (patch by Jonas Zeiger) + #22754 - add support for svn_delete + #22100 - segfault on shutdown when using multiple repositories - patch by jimmy at velsoft + + + + + + + + + + + + + + + + + + + + + + + + + 4.0.0 + 6.0.0 + + + 1.4.0 + + + + + svn + + + + + + + + + + 2010-12-09 + + 1.0.1 + 1.0.0 + + + + stable + stable + + + PHP License + + + Minor bug fix release + + #18513 - svn_info( working_copy, false, SVN_REVISION_UNSPECIFIED ) gives you a svn_info on the local copy + #20440 - svn_mkdir on working copy log message is optional + + + + + + + + + + 2010-05-13 + + 1.0.0 + 1.0.0 + + + + stable + stable + + + PHP License + + +Bumped release to stable, as not much is really changing and the API is pretty steady. + + +- not handling SVN_REVISION_COMMITTED, SVN_REVISION_PREV, SVN_REVISION_BASE properly + (svn_ls, svn_info, svn_update, svn_export) (Chung, Hyung-Hwan) +- not handling utf8 failure (Chung, Hyung-Hwan) + (svn_update, svn_export, svn_repos_create, svn_commit, svn_add, svn_status, svn_blame) +- using a wrong type for the 'l' parameter that can cause a problem on architectures where + sizeof(int) != sizeof(long) - ( svn_info, svn_ls ) (Chung, Hyung-Hwan) +- multiple utf8 check fixes - (Chung, Hyung-Hwan) +- add revision parameter to svn_propget and svn_proplist, do utf8 checks (Chung, Hyung-Hwan) +- fix bug #17080 - svn_mkdir requires log message, also added utf8 checks (Ivan P) +- req #14360 - support svn_export with revisions (lostoutfrog) +- php 5.3.0 TSRMLS_CC additions (Thomas Krause) +- update package xml to v2 (Pierre Joye) + + + + + + + + + 2008-09-24 + + 0.5.1 + 0.5.1 + + + + beta + beta + + + PHP License + + + fix for libsvn 1.6.2 + + + + + + 2008-10-09 + + 0.5.0 + 0.5.0 + + + + beta + beta + + + PHP License + + + - Add svn_lock()/svn_unlock() + - Add svn_config_ensure() for setting up a .svn storage directory + - Disable password storing unless a password is explicitly set + - Allow svn_auth_set_parameter() to unset an option with NULL + - svn_blame() returned -1 for a revision number + - Fix segfault caused by using an already destroyed pool + - Fix segfault when certain data types aren't returned from a commit + - Add check on module load that the APR version matches. + - Fix fatal error when the location of the HOME enviromental variable can't be read + + + + + 2008-06-24 + + 0.4.1 + 0.4.1 + + + + beta + beta + + + PHP License + + + - Add recurse option to svn_ls() + - Change array keys returned from svn_ls() to be filename + - Potential BC break with some lower case constants, these are now uppercase. + + + + 2008-06-04 + + 0.4 + 0.4 + + + + beta + beta + + + PHP License + + + - Fix bug #13414 - Crash when SVN environment fails to initialise. + - Fix bug #13677,#13162 - Several functions fail to canonicalized resulting in an abort() call. + - Revert change that prevented libsvn 1.3 from being used. + - Add check during configure for minimum libsvn version. + - Add support for svn_delete(), svn_mkdir(), svn_move(), svn_proplist() and svn_propget(). + - Allow svn_commit() to take a string instead of an array for paths. + - Revert backwards compatible break with svn_log() + + + + + 0.3 + 0.3 + + + beta + beta + + 2008-02-09 + PHP Licence + + Backward Compatibilty Breaks: + Minimum subversion version is 1.4. + svn_status call arguments have changed - it now uses Flags. + + New Constants: + + SVN_REVISION_INITIAL + SVN_REVISION_HEAD + SVN_REVISION_BASE + SVN_REVISION_COMMITTED + SVN_REVISION_PREV + + SVN_NON_RECURSIVE + SVN_DISCOVER_CHANGED_PATHS + SVN_OMIT_MESSAGES + SVN_STOP_ON_COPY + SVN_ALL + SVN_SHOW_UPDATES + SVN_NO_IGNORE + + All constants are also available as Svn::REVISON_HEAD. + + Win32 Compatibility: + Most functions have been fixed to work with Win32 paths. + + - Fix bug #11153 - svn diff uses utf8 paths + - Fix bug #11157 - missing constants needed for svn_status + - Rewrite configure script to find APR and its compile flags + - Add support for svn_info() - patch by Marco Tabini + - Add support for svn_export() - patch by Scott MacVicar + - Add support for svn_copy() and svn_switch() - patch by Conny Dahlgren + - Add support for svn_blame() / svn_revert() - patch by Jerome Renard + - Add support for limiting results with svn_log() - patch by Edward Z. Yang + - Add support for limiting svn_checkout() - patch by Devlar + - Add constants for use as parameters to svn_cat() - patch by Devlar + - Add an OO interface to the extension - patch by Devlar + + + + + 0.2 + 0.2 + + + beta + beta + + 2006-03-20 + PHP Licence + + + - Compiles on Win32 + Netware (Thanks to Guenter Knauf) + - dependancy on svn-config removed (as recommended by Subversion developers) + - Pretty complete implementation. + + Bugs + #6893 - correct types for strict compilers + + + Known issues: + There are bug reports about commit / checkout functionality. Any help + reproducing and fixing these is welcome. + + + + + + 0.1 + 0.1 + + + beta + beta + + 2005-05-28 + PHP Licence + + - First working release (works ok here!) + + + + + diff --git a/codepot/pecl-svn/php_svn.h b/codepot/pecl-svn/php_svn.h new file mode 100755 index 00000000..ee4b4dd2 --- /dev/null +++ b/codepot/pecl-svn/php_svn.h @@ -0,0 +1,169 @@ +/* + +----------------------------------------------------------------------+ + | PHP Version 5 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2008 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Authors: Alan Knowles | + | Wez Furlong | + | Luca Furini | + | Jerome Renard | + | Develar | + +----------------------------------------------------------------------+ +*/ + +/* $Id: php_svn.h 333800 2014-06-16 05:22:31Z alan_k $ */ + +#ifndef PHP_SVN_H +#define PHP_SVN_H + +extern zend_module_entry svn_module_entry; +#define phpext_svn_ptr &svn_module_entry + +#define PHP_SVN_VERSION "1.0.3-dev" + +#ifdef PHP_WIN32 +#define PHP_SVN_API __declspec(dllexport) +#else +#define PHP_SVN_API +#endif + +#ifdef ZTS +#include "TSRM.h" +#endif + +#include "svn_client.h" + +PHP_MINIT_FUNCTION(svn); +PHP_MSHUTDOWN_FUNCTION(svn); +PHP_RINIT_FUNCTION(svn); +PHP_RSHUTDOWN_FUNCTION(svn); +PHP_MINFO_FUNCTION(svn); + +PHP_FUNCTION(svn_checkout); +PHP_FUNCTION(svn_cat); +PHP_FUNCTION(svn_ls); +PHP_FUNCTION(svn_log); +PHP_FUNCTION(svn_auth_set_parameter); +PHP_FUNCTION(svn_auth_get_parameter); +PHP_FUNCTION(svn_client_version); +PHP_FUNCTION(svn_config_ensure); +PHP_FUNCTION(svn_diff); +PHP_FUNCTION(svn_cleanup); +PHP_FUNCTION(svn_revert); +PHP_FUNCTION(svn_resolved); +PHP_FUNCTION(svn_lock); +PHP_FUNCTION(svn_unlock); + +PHP_FUNCTION(svn_commit); +PHP_FUNCTION(svn_add); +PHP_FUNCTION(svn_status); +PHP_FUNCTION(svn_update); +PHP_FUNCTION(svn_import); +PHP_FUNCTION(svn_info); +PHP_FUNCTION(svn_export); +PHP_FUNCTION(svn_copy); +PHP_FUNCTION(svn_switch); +PHP_FUNCTION(svn_blame); +PHP_FUNCTION(svn_delete); +PHP_FUNCTION(svn_mkdir); +PHP_FUNCTION(svn_move); +PHP_FUNCTION(svn_proplist); +PHP_FUNCTION(svn_propget); +PHP_FUNCTION(svn_revprop_get); +PHP_FUNCTION(svn_revprop_set); +PHP_FUNCTION(svn_revprop_delete); + +PHP_FUNCTION(svn_repos_create); +PHP_FUNCTION(svn_repos_recover); +PHP_FUNCTION(svn_repos_hotcopy); +PHP_FUNCTION(svn_repos_open); +PHP_FUNCTION(svn_repos_fs); +PHP_FUNCTION(svn_repos_fs_begin_txn_for_commit); +PHP_FUNCTION(svn_repos_fs_commit_txn); +PHP_FUNCTION(svn_fs_revision_root); +PHP_FUNCTION(svn_fs_check_path); +PHP_FUNCTION(svn_fs_revision_prop); +PHP_FUNCTION(svn_fs_dir_entries); +PHP_FUNCTION(svn_fs_node_created_rev); +PHP_FUNCTION(svn_fs_youngest_rev); +PHP_FUNCTION(svn_fs_file_contents); +PHP_FUNCTION(svn_fs_file_length); +PHP_FUNCTION(svn_fs_txn_root); +PHP_FUNCTION(svn_fs_make_file); +PHP_FUNCTION(svn_fs_make_dir); +PHP_FUNCTION(svn_fs_apply_text); +PHP_FUNCTION(svn_fs_copy); +PHP_FUNCTION(svn_fs_delete); +PHP_FUNCTION(svn_fs_begin_txn2); +PHP_FUNCTION(svn_fs_is_dir); +PHP_FUNCTION(svn_fs_is_file); +PHP_FUNCTION(svn_fs_node_prop); +PHP_FUNCTION(svn_fs_change_node_prop); +PHP_FUNCTION(svn_fs_contents_changed); +PHP_FUNCTION(svn_fs_props_changed); +PHP_FUNCTION(svn_fs_abort_txn); +PHP_FUNCTION(svn_fs_open_txn); +PHP_FUNCTION(svn_fs_txn_prop); + +/* TODO: */ + + +PHP_FUNCTION(svn_merge); +PHP_FUNCTION(svn_propset); +PHP_FUNCTION(svn_url_from_path); +PHP_FUNCTION(svn_uuid_from_url); +PHP_FUNCTION(svn_uuid_from_path); + + +/** constants **/ + +#define SVN_REVISION_INITIAL 1 +#define SVN_REVISION_HEAD -1 +#define SVN_REVISION_BASE -2 +#define SVN_REVISION_COMMITTED -3 +#define SVN_REVISION_PREV -4 +#define SVN_REVISION_UNSPECIFIED -5 + +#define SVN_NON_RECURSIVE 1 /* --non-recursive */ +#define SVN_DISCOVER_CHANGED_PATHS 2 /* --verbose */ +#define SVN_OMIT_MESSAGES 4 /* --quiet */ +#define SVN_STOP_ON_COPY 8 /* --stop-on-copy */ +#define SVN_ALL 16 /* --verbose in svn status */ +#define SVN_SHOW_UPDATES 32 /* --show-updates */ +#define SVN_NO_IGNORE 64 /* --no-ignore */ +#define SVN_IGNORE_EXTERNALS 128 /* --ignore-externals */ + + + + +ZEND_BEGIN_MODULE_GLOBALS(svn) + apr_pool_t *pool; + svn_client_ctx_t *ctx; +ZEND_END_MODULE_GLOBALS(svn) + +#ifdef ZTS +#define SVN_G(v) TSRMG(svn_globals_id, zend_svn_globals *, v) +#else +#define SVN_G(v) (svn_globals.v) +#endif + +#endif /* PHP_SVN_H */ + + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ diff --git a/codepot/pecl-svn/svn.c b/codepot/pecl-svn/svn.c new file mode 100755 index 00000000..1a48ea57 --- /dev/null +++ b/codepot/pecl-svn/svn.c @@ -0,0 +1,4442 @@ +/* + +----------------------------------------------------------------------+ + | PHP Version 5 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2008 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Authors: Alan Knowles | + | Wez Furlong | + | Scott MacVicar | + | Luca Furini | + | Jerome Renard | + | Develar | + +----------------------------------------------------------------------+ +*/ + +/* $Id: svn.c 333800 2014-06-16 05:22:31Z alan_k $ */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "php.h" +#include "php_ini.h" +#include "ext/standard/info.h" +#include "php_svn.h" + +#include "apr_version.h" +#include "svn_pools.h" +#include "svn_sorts.h" +#include "svn_config.h" +#include "svn_auth.h" +#include "svn_path.h" +#include "svn_fs.h" +#include "svn_repos.h" +#include "svn_utf.h" +#include "svn_time.h" +#include "svn_props.h" +#include "svn_version.h" + +ZEND_DECLARE_MODULE_GLOBALS(svn) + +/* custom property for ignoring SSL cert verification errors */ +#define PHP_SVN_AUTH_PARAM_IGNORE_SSL_VERIFY_ERRORS "php:svn:auth:ignore-ssl-verify-errors" +#define PHP_SVN_INIT_CLIENT() \ + do { \ + if (init_svn_client(TSRMLS_C)) RETURN_FALSE; \ + } while (0) + +static void php_svn_get_version(char *buf, int buflen); + +/* True global resources - no need for thread safety here */ + +struct php_svn_repos { + long rsrc_id; + apr_pool_t *pool; + svn_repos_t *repos; +}; + +struct php_svn_fs { + struct php_svn_repos *repos; + svn_fs_t *fs; +}; + +struct php_svn_fs_root { + struct php_svn_repos *repos; + svn_fs_root_t *root; +}; + +struct php_svn_repos_fs_txn { + struct php_svn_repos *repos; + svn_fs_txn_t *txn; +}; + + +struct php_svn_log_receiver_baton { + zval *result; + svn_boolean_t omit_messages; +}; + +/* class entry constants */ +static zend_class_entry *ce_Svn; + +/* resource constants */ +static int le_svn_repos; +static int le_svn_fs; +static int le_svn_fs_root; +static int le_svn_repos_fs_txn; + +static ZEND_RSRC_DTOR_FUNC(php_svn_repos_dtor) +{ + struct php_svn_repos *r = rsrc->ptr; + /* If root pool doesn't exist, then this resource's pool was already destroyed */ + if (SVN_G(pool)) { + svn_pool_destroy(r->pool); + } + efree(r); +} + +static ZEND_RSRC_DTOR_FUNC(php_svn_fs_dtor) +{ + struct php_svn_fs *r = rsrc->ptr; + zend_list_delete(r->repos->rsrc_id); + efree(r); +} + +static ZEND_RSRC_DTOR_FUNC(php_svn_fs_root_dtor) +{ + struct php_svn_fs_root *r = rsrc->ptr; + zend_list_delete(r->repos->rsrc_id); + efree(r); +} + +static ZEND_RSRC_DTOR_FUNC(php_svn_repos_fs_txn_dtor) +{ + struct php_svn_repos_fs_txn *r = rsrc->ptr; + zend_list_delete(r->repos->rsrc_id); + efree(r); +} + +#define SVN_STATIC_ME(name) ZEND_FENTRY(name, ZEND_FN(svn_ ## name), NULL, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC) +/** Fixme = this list needs padding out... */ +static zend_function_entry svn_methods[] = { + SVN_STATIC_ME(cat) + SVN_STATIC_ME(checkout) + SVN_STATIC_ME(log) + SVN_STATIC_ME(status) + + {NULL, NULL, NULL} +}; + + +/* {{{ svn_functions[] */ +zend_function_entry svn_functions[] = { + PHP_FE(svn_checkout, NULL) + PHP_FE(svn_cat, NULL) + PHP_FE(svn_ls, NULL) + PHP_FE(svn_log, NULL) + PHP_FE(svn_auth_set_parameter, NULL) + PHP_FE(svn_auth_get_parameter, NULL) + PHP_FE(svn_client_version, NULL) + PHP_FE(svn_config_ensure, NULL) + PHP_FE(svn_diff, NULL) + PHP_FE(svn_cleanup, NULL) + PHP_FE(svn_revert, NULL) + PHP_FE(svn_resolved, NULL) + PHP_FE(svn_commit, NULL) + PHP_FE(svn_lock, NULL) + PHP_FE(svn_unlock, NULL) + PHP_FE(svn_add, NULL) + PHP_FE(svn_status, NULL) + PHP_FE(svn_update, NULL) + PHP_FE(svn_import, NULL) + PHP_FE(svn_info, NULL) + PHP_FE(svn_export, NULL) + PHP_FE(svn_copy, NULL) + PHP_FE(svn_switch, NULL) + PHP_FE(svn_blame, NULL) + PHP_FE(svn_delete, NULL) + PHP_FE(svn_mkdir, NULL) + PHP_FE(svn_move, NULL) + PHP_FE(svn_proplist, NULL) + PHP_FE(svn_propget, NULL) + PHP_FE(svn_revprop_get, NULL) + PHP_FE(svn_revprop_set, NULL) + PHP_FE(svn_revprop_delete, NULL) + PHP_FE(svn_repos_create, NULL) + PHP_FE(svn_repos_recover, NULL) + PHP_FE(svn_repos_hotcopy, NULL) + PHP_FE(svn_repos_open, NULL) + PHP_FE(svn_repos_fs, NULL) + PHP_FE(svn_repos_fs_begin_txn_for_commit, NULL) + PHP_FE(svn_repos_fs_commit_txn, NULL) + PHP_FE(svn_fs_revision_root, NULL) + PHP_FE(svn_fs_check_path, NULL) + PHP_FE(svn_fs_revision_prop, NULL) + PHP_FE(svn_fs_dir_entries, NULL) + PHP_FE(svn_fs_node_created_rev, NULL) + PHP_FE(svn_fs_youngest_rev, NULL) + PHP_FE(svn_fs_file_contents, NULL) + PHP_FE(svn_fs_file_length, NULL) + PHP_FE(svn_fs_txn_root, NULL) + PHP_FE(svn_fs_make_file, NULL) + PHP_FE(svn_fs_make_dir, NULL) + PHP_FE(svn_fs_apply_text, NULL) + PHP_FE(svn_fs_copy, NULL) + PHP_FE(svn_fs_delete, NULL) + PHP_FE(svn_fs_begin_txn2, NULL) + PHP_FE(svn_fs_is_dir, NULL) + PHP_FE(svn_fs_is_file, NULL) + PHP_FE(svn_fs_node_prop, NULL) + PHP_FE(svn_fs_change_node_prop, NULL) + PHP_FE(svn_fs_contents_changed, NULL) + PHP_FE(svn_fs_props_changed, NULL) + PHP_FE(svn_fs_abort_txn, NULL) + PHP_FE(svn_fs_open_txn, NULL) + PHP_FE(svn_fs_txn_prop, NULL) + + {NULL, NULL, NULL} +}; +/* }}} */ + +/* {{{ svn_module_entry */ +zend_module_entry svn_module_entry = { +#if ZEND_MODULE_API_NO >= 20010901 + STANDARD_MODULE_HEADER, +#endif + "svn", + svn_functions, + PHP_MINIT(svn), + NULL, + NULL, + PHP_RSHUTDOWN(svn), + PHP_MINFO(svn), +#if ZEND_MODULE_API_NO >= 20010901 + PHP_SVN_VERSION, +#endif + STANDARD_MODULE_PROPERTIES +}; +/* }}} */ + + +#ifdef COMPILE_DL_SVN +ZEND_GET_MODULE(svn) +#endif + +/* {{{ php_svn_get_revision_kind */ +static enum svn_opt_revision_kind php_svn_get_revision_kind(svn_opt_revision_t revision) +{ + switch(revision.value.number) { + case svn_opt_revision_unspecified: + /* through */ + case SVN_REVISION_HEAD: + return svn_opt_revision_head; + case SVN_REVISION_BASE: + return svn_opt_revision_base; + case SVN_REVISION_COMMITTED: + return svn_opt_revision_committed; + case SVN_REVISION_PREV: + return svn_opt_revision_previous; + default: + return svn_opt_revision_number; + } +} +/* }}} */ + + +#include "ext/standard/php_smart_str.h" +static void php_svn_handle_error(svn_error_t *error TSRMLS_DC) +{ + svn_error_t *itr = error; + smart_str s = {0,0,0}; + + smart_str_appendl(&s, "svn error(s) occured\n", sizeof("svn error(s) occured\n")-1); + + while (itr) { + char buf[256]; + + smart_str_append_long(&s, itr->apr_err); + smart_str_appendl(&s, " (", 2); + + svn_strerror(itr->apr_err, buf, sizeof(buf)); + smart_str_appendl(&s, buf, strlen(buf)); + smart_str_appendl(&s, ") ", 2); + if (itr->message) { + smart_str_appendl(&s, itr->message, strlen(itr->message)); + } + + if (itr->child) { + smart_str_appendl(&s, "\n", 1); + } + itr = itr->child; + } + + smart_str_appendl(&s, "\n", 1); + smart_str_0(&s); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", s.c); + smart_str_free(&s); +} + +static svn_error_t *php_svn_auth_ssl_client_server_trust_prompter( + svn_auth_cred_ssl_server_trust_t **cred, + void *baton, + const char *realm, + apr_uint32_t failures, + const svn_auth_ssl_server_cert_info_t *cert_info, + svn_boolean_t may_save, + apr_pool_t *pool) +{ + const char *ignore; + TSRMLS_FETCH(); + + ignore = (const char*)svn_auth_get_parameter(SVN_G(ctx)->auth_baton, PHP_SVN_AUTH_PARAM_IGNORE_SSL_VERIFY_ERRORS); + if (ignore && atoi(ignore)) { + *cred = apr_palloc(SVN_G(pool), sizeof(**cred)); + (*cred)->may_save = 0; + (*cred)->accepted_failures = failures; + } + + return SVN_NO_ERROR; +} + +static void php_svn_init_globals(zend_svn_globals *g) +{ + memset(g, 0, sizeof(*g)); +} + +static svn_error_t *php_svn_get_commit_log(const char **log_msg, const char **tmp_file, + apr_array_header_t *commit_items, void *baton, apr_pool_t *pool) +{ + *log_msg = (const char*)baton; + *tmp_file = NULL; + return SVN_NO_ERROR; +} + +static int init_svn_client(TSRMLS_D) +{ + svn_error_t *err; + svn_auth_provider_object_t *provider; + svn_auth_baton_t *ab; + apr_array_header_t *providers; + + if (SVN_G(pool)) return 0; + + SVN_G(pool) = svn_pool_create(NULL); + + if ((err = svn_client_create_context (&SVN_G(ctx), SVN_G(pool)))) { + php_svn_handle_error(err TSRMLS_CC); + svn_pool_destroy(SVN_G(pool)); + SVN_G(pool) = NULL; + return 1; + } + + if ((err = svn_config_get_config(&SVN_G(ctx)->config, NULL, SVN_G(pool)))) { + if (err->apr_err == APR_EACCES) { + /* Should possible consider a notice here */ + svn_error_clear(err); + } else { + php_svn_handle_error(err TSRMLS_CC); + svn_pool_destroy(SVN_G(pool)); + SVN_G(pool) = NULL; + return 1; + } + } + + SVN_G(ctx)->log_msg_func = php_svn_get_commit_log; + + /* The whole list of registered providers */ + + providers = apr_array_make (SVN_G(pool), 10, sizeof (svn_auth_provider_object_t *)); + + /* The main disk-caching auth providers, for both + 'username/password' creds and 'username' creds. */ + svn_client_get_simple_provider (&provider, SVN_G(pool)); + APR_ARRAY_PUSH (providers, svn_auth_provider_object_t *) = provider; + + svn_client_get_username_provider (&provider, SVN_G(pool)); + APR_ARRAY_PUSH (providers, svn_auth_provider_object_t *) = provider; + + svn_client_get_ssl_server_trust_prompt_provider (&provider, php_svn_auth_ssl_client_server_trust_prompter, NULL, SVN_G(pool)); + APR_ARRAY_PUSH (providers, svn_auth_provider_object_t *) = provider; + + /* The server-cert, client-cert, and client-cert-password providers. */ + svn_client_get_ssl_server_trust_file_provider (&provider, SVN_G(pool)); + APR_ARRAY_PUSH (providers, svn_auth_provider_object_t *) = provider; + + svn_client_get_ssl_client_cert_file_provider (&provider, SVN_G(pool)); + APR_ARRAY_PUSH (providers, svn_auth_provider_object_t *) = provider; + + svn_client_get_ssl_client_cert_pw_file_provider (&provider, SVN_G(pool)); + APR_ARRAY_PUSH (providers, svn_auth_provider_object_t *) = provider; + + + /* skip prompt stuff */ + svn_auth_open (&ab, providers, SVN_G(pool)); + /* turn off prompting */ + svn_auth_set_parameter(ab, SVN_AUTH_PARAM_NON_INTERACTIVE, ""); + SVN_G(ctx)->auth_baton = ab; + + return 0; +} + +/* {{{ proto string svn_auth_get_parameter(string key) + Retrieves authentication parameter at key */ +PHP_FUNCTION(svn_auth_get_parameter) +{ + char *key; + int keylen; + const char *value; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &key, &keylen)) { + return; + } + + PHP_SVN_INIT_CLIENT(); + + value = svn_auth_get_parameter(SVN_G(ctx)->auth_baton, key); + if (value) { + RETVAL_STRING((char*)value, 1); + } +} +/* }}} */ + +/* {{{ proto void svn_auth_set_parameter(string key, string value) + Sets authentication parameter at key to value */ +PHP_FUNCTION(svn_auth_set_parameter) +{ + char *key, *actual_value = NULL; + zval *value; + int keylen; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz", &key, &keylen, &value)) { + return; + } + PHP_SVN_INIT_CLIENT(); + + if (strcmp(key, SVN_AUTH_PARAM_DEFAULT_PASSWORD) == 0) { + svn_auth_set_parameter(SVN_G(ctx)->auth_baton, SVN_AUTH_PARAM_DONT_STORE_PASSWORDS, ""); + } + + if (Z_TYPE_P(value) != IS_NULL) { + convert_to_string_ex(&value); + actual_value = Z_STRVAL_P(value); + } + + svn_auth_set_parameter(SVN_G(ctx)->auth_baton, apr_pstrdup(SVN_G(pool), key), apr_pstrdup(SVN_G(pool), actual_value)); + +} +/* }}} */ + +/* {{{ proto bool svn_config_ensure(string config_path) + Ensure that the specified path looks like a subversion config path. + This function will create skeleton files if required. */ +PHP_FUNCTION(svn_config_ensure) +{ + const char *config_path = NULL; + const char *utf8_path = NULL; + int config_path_len; + apr_pool_t *subpool; + svn_error_t *err; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!", &config_path, &config_path_len)) { + return; + } + + PHP_SVN_INIT_CLIENT(); + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + if (config_path) { + err = svn_utf_cstring_to_utf8 (&utf8_path, config_path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + config_path = svn_path_canonicalize(utf8_path, subpool); + } + + err = svn_config_ensure(config_path, subpool); + if (err) { + RETVAL_FALSE; + } else { + RETVAL_TRUE; + } + +cleanup: + svn_pool_destroy(subpool); + +} +/* }}} */ + +/* {{{ proto bool svn_import(string path, string url, bool nonrecursive) + Imports unversioned path into repository at url */ +PHP_FUNCTION(svn_import) +{ + svn_client_commit_info_t *commit_info_p = NULL; + const char *path = NULL; + const char *utf8_path = NULL; + int pathlen; + char *url; + int urllen; + svn_boolean_t nonrecursive; + svn_error_t *err; + apr_pool_t *subpool; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssb", + &path, &pathlen, &url, &urllen, &nonrecursive)) { + RETURN_FALSE; + } + + PHP_SVN_INIT_CLIENT(); + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + path = svn_path_canonicalize(utf8_path, subpool); + + err = svn_client_import(&commit_info_p, path, url, nonrecursive, + SVN_G(ctx), subpool); + if (err) { + php_svn_handle_error (err TSRMLS_CC); + RETVAL_FALSE; + } else { + RETVAL_TRUE; + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ PHP_MINIT_FUNCTION */ +PHP_MINIT_FUNCTION(svn) +{ + zend_class_entry ce; + zend_class_entry *ce_SvnWc; + zend_class_entry *ce_SvnWcSchedule; + zend_class_entry *ce_SvnNode; + apr_version_t apv; + + apr_initialize(); + + /* Print something useful when old APR is used like that of Apache 2.0.x */ + apr_version(&apv); + if (apv.major < APR_MAJOR_VERSION) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "libsvn was compiled against a newer version of APR than was loaded"); + } + + ZEND_INIT_MODULE_GLOBALS(svn, php_svn_init_globals, NULL); + + INIT_CLASS_ENTRY(ce, "Svn", svn_methods); + ce_Svn = zend_register_internal_class(&ce TSRMLS_CC); + + + INIT_CLASS_ENTRY(ce, "SvnWc", NULL); + ce_SvnWc = zend_register_internal_class(&ce TSRMLS_CC); + + INIT_CLASS_ENTRY(ce, "SvnWcSchedule", NULL); + ce_SvnWcSchedule = zend_register_internal_class(&ce TSRMLS_CC); + + INIT_CLASS_ENTRY(ce, "SvnNode", NULL); + ce_SvnNode = zend_register_internal_class(&ce TSRMLS_CC); + + +#define CLASS_CONST_LONG(class_name, const_name, value) \ + zend_declare_class_constant_long(ce_ ## class_name, const_name, \ + sizeof(const_name)-1, (long)value TSRMLS_CC); + + CLASS_CONST_LONG(Svn, "NON_RECURSIVE", SVN_NON_RECURSIVE); + CLASS_CONST_LONG(Svn, "DISCOVER_CHANGED_PATHS", SVN_DISCOVER_CHANGED_PATHS); + CLASS_CONST_LONG(Svn, "OMIT_MESSAGES", SVN_OMIT_MESSAGES); + CLASS_CONST_LONG(Svn, "STOP_ON_COPY", SVN_STOP_ON_COPY); + CLASS_CONST_LONG(Svn, "ALL", SVN_ALL); + CLASS_CONST_LONG(Svn, "SHOW_UPDATES", SVN_SHOW_UPDATES); + CLASS_CONST_LONG(Svn, "NO_IGNORE", SVN_NO_IGNORE); + CLASS_CONST_LONG(Svn, "IGNORE_EXTERNALS", SVN_IGNORE_EXTERNALS); + + CLASS_CONST_LONG(Svn, "INITIAL", SVN_REVISION_INITIAL); + CLASS_CONST_LONG(Svn, "HEAD", SVN_REVISION_HEAD); + CLASS_CONST_LONG(Svn, "BASE", SVN_REVISION_BASE); + CLASS_CONST_LONG(Svn, "COMMITTED", SVN_REVISION_COMMITTED); + CLASS_CONST_LONG(Svn, "PREV", SVN_REVISION_PREV); + CLASS_CONST_LONG(Svn, "UNSPECIFIED", SVN_REVISION_UNSPECIFIED); + + + CLASS_CONST_LONG(SvnWc, "NONE", svn_wc_status_none); + CLASS_CONST_LONG(SvnWc, "UNVERSIONED", svn_wc_status_unversioned); + CLASS_CONST_LONG(SvnWc, "NORMAL", svn_wc_status_normal); + CLASS_CONST_LONG(SvnWc, "ADDED", svn_wc_status_added); + CLASS_CONST_LONG(SvnWc, "MISSING", svn_wc_status_missing); + CLASS_CONST_LONG(SvnWc, "DELETED", svn_wc_status_deleted); + CLASS_CONST_LONG(SvnWc, "REPLACED", svn_wc_status_replaced); + CLASS_CONST_LONG(SvnWc, "MODIFIED", svn_wc_status_modified); + CLASS_CONST_LONG(SvnWc, "MERGED", svn_wc_status_merged); + CLASS_CONST_LONG(SvnWc, "CONFLICTED", svn_wc_status_conflicted); + CLASS_CONST_LONG(SvnWc, "IGNORED", svn_wc_status_ignored); + CLASS_CONST_LONG(SvnWc, "OBSTRUCTED", svn_wc_status_obstructed); + CLASS_CONST_LONG(SvnWc, "EXTERNAL", svn_wc_status_external); + CLASS_CONST_LONG(SvnWc, "INCOMPLETE", svn_wc_status_incomplete); + + CLASS_CONST_LONG(SvnWcSchedule, "NORMAL", svn_wc_schedule_normal); + CLASS_CONST_LONG(SvnWcSchedule, "ADD", svn_wc_schedule_add); + CLASS_CONST_LONG(SvnWcSchedule, "DELETE", svn_wc_schedule_delete); + CLASS_CONST_LONG(SvnWcSchedule, "REPLACE", svn_wc_schedule_replace); + + CLASS_CONST_LONG(SvnNode, "NONE", svn_node_none); + CLASS_CONST_LONG(SvnNode, "FILE", svn_node_file); + CLASS_CONST_LONG(SvnNode, "DIR", svn_node_dir); + CLASS_CONST_LONG(SvnNode, "UNKNOWN", svn_node_unknown); + + + REGISTER_STRING_CONSTANT("SVN_AUTH_PARAM_DEFAULT_USERNAME", SVN_AUTH_PARAM_DEFAULT_USERNAME, CONST_CS|CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("SVN_AUTH_PARAM_DEFAULT_PASSWORD", SVN_AUTH_PARAM_DEFAULT_PASSWORD, CONST_CS|CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("SVN_AUTH_PARAM_NON_INTERACTIVE", SVN_AUTH_PARAM_NON_INTERACTIVE, CONST_CS|CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("SVN_AUTH_PARAM_DONT_STORE_PASSWORDS", SVN_AUTH_PARAM_DONT_STORE_PASSWORDS, CONST_CS|CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("SVN_AUTH_PARAM_NO_AUTH_CACHE", SVN_AUTH_PARAM_NO_AUTH_CACHE, CONST_CS|CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("SVN_AUTH_PARAM_SSL_SERVER_FAILURES", SVN_AUTH_PARAM_SSL_SERVER_FAILURES, CONST_CS|CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("SVN_AUTH_PARAM_SSL_SERVER_CERT_INFO", SVN_AUTH_PARAM_SSL_SERVER_CERT_INFO, CONST_CS|CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("SVN_AUTH_PARAM_CONFIG", SVN_AUTH_PARAM_CONFIG, CONST_CS|CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("SVN_AUTH_PARAM_SERVER_GROUP", SVN_AUTH_PARAM_SERVER_GROUP, CONST_CS|CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("SVN_AUTH_PARAM_CONFIG_DIR", SVN_AUTH_PARAM_CONFIG_DIR, CONST_CS|CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("PHP_SVN_AUTH_PARAM_IGNORE_SSL_VERIFY_ERRORS", PHP_SVN_AUTH_PARAM_IGNORE_SSL_VERIFY_ERRORS, CONST_CS|CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("SVN_FS_CONFIG_FS_TYPE", SVN_FS_CONFIG_FS_TYPE, CONST_CS|CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("SVN_FS_TYPE_BDB", SVN_FS_TYPE_BDB, CONST_CS|CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("SVN_FS_TYPE_FSFS", SVN_FS_TYPE_FSFS, CONST_CS|CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("SVN_PROP_REVISION_DATE", SVN_PROP_REVISION_DATE, CONST_CS|CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("SVN_PROP_REVISION_ORIG_DATE", SVN_PROP_REVISION_ORIG_DATE, CONST_CS|CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("SVN_PROP_REVISION_AUTHOR", SVN_PROP_REVISION_AUTHOR, CONST_CS|CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("SVN_PROP_REVISION_LOG", SVN_PROP_REVISION_LOG, CONST_CS|CONST_PERSISTENT); + + REGISTER_LONG_CONSTANT("SVN_REVISION_INITIAL", SVN_REVISION_INITIAL, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_REVISION_HEAD", SVN_REVISION_HEAD, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_REVISION_BASE", SVN_REVISION_BASE, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_REVISION_COMMITTED", SVN_REVISION_COMMITTED, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_REVISION_PREV", SVN_REVISION_PREV, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_REVISION_UNSPECIFIED", SVN_REVISION_UNSPECIFIED, CONST_CS|CONST_PERSISTENT); + + REGISTER_LONG_CONSTANT("SVN_NON_RECURSIVE", SVN_NON_RECURSIVE, CONST_CS|CONST_PERSISTENT); /* --non-recursive */ + REGISTER_LONG_CONSTANT("SVN_DISCOVER_CHANGED_PATHS", SVN_DISCOVER_CHANGED_PATHS, CONST_CS|CONST_PERSISTENT); /* --verbose */ + REGISTER_LONG_CONSTANT("SVN_OMIT_MESSAGES", SVN_OMIT_MESSAGES, CONST_CS|CONST_PERSISTENT); /* --quiet */ + REGISTER_LONG_CONSTANT("SVN_STOP_ON_COPY", SVN_STOP_ON_COPY, CONST_CS|CONST_PERSISTENT); /* --stop-on-copy */ + REGISTER_LONG_CONSTANT("SVN_ALL", SVN_ALL, CONST_CS|CONST_PERSISTENT); /* --verbose in svn status */ + REGISTER_LONG_CONSTANT("SVN_SHOW_UPDATES", SVN_SHOW_UPDATES, CONST_CS|CONST_PERSISTENT); /* --show-updates */ + REGISTER_LONG_CONSTANT("SVN_NO_IGNORE", SVN_NO_IGNORE, CONST_CS|CONST_PERSISTENT); /* --no-ignore */ + + REGISTER_LONG_CONSTANT("SVN_WC_STATUS_NONE", svn_wc_status_none, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_WC_STATUS_UNVERSIONED", svn_wc_status_unversioned, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_WC_STATUS_NORMAL", svn_wc_status_normal, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_WC_STATUS_ADDED", svn_wc_status_added, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_WC_STATUS_MISSING", svn_wc_status_missing, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_WC_STATUS_DELETED", svn_wc_status_deleted, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_WC_STATUS_REPLACED", svn_wc_status_replaced, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_WC_STATUS_MODIFIED", svn_wc_status_modified, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_WC_STATUS_MERGED", svn_wc_status_merged, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_WC_STATUS_CONFLICTED", svn_wc_status_conflicted, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_WC_STATUS_IGNORED", svn_wc_status_ignored, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_WC_STATUS_OBSTRUCTED", svn_wc_status_obstructed, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_WC_STATUS_EXTERNAL", svn_wc_status_external, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_WC_STATUS_INCOMPLETE", svn_wc_status_incomplete, CONST_CS|CONST_PERSISTENT); + + REGISTER_LONG_CONSTANT("SVN_NODE_NONE", svn_node_none, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_NODE_FILE", svn_node_file, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_NODE_DIR", svn_node_dir, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_NODE_UNKNOWN", svn_node_unknown, CONST_CS|CONST_PERSISTENT); + + + REGISTER_LONG_CONSTANT("SVN_WC_SCHEDULE_NORMAL", svn_wc_schedule_normal, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_WC_SCHEDULE_ADD", svn_wc_schedule_add, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_WC_SCHEDULE_DELETE", svn_wc_schedule_delete, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SVN_WC_SCHEDULE_REPLACE", svn_wc_schedule_replace, CONST_CS|CONST_PERSISTENT); + + le_svn_repos = zend_register_list_destructors_ex(php_svn_repos_dtor, + NULL, "svn-repos", module_number); + + le_svn_fs = zend_register_list_destructors_ex(php_svn_fs_dtor, + NULL, "svn-fs", module_number); + + le_svn_fs_root = zend_register_list_destructors_ex(php_svn_fs_root_dtor, + NULL, "svn-fs-root", module_number); + + le_svn_repos_fs_txn = zend_register_list_destructors_ex(php_svn_repos_fs_txn_dtor, + NULL, "svn-repos-fs-txn", module_number); + + return SUCCESS; +} +/* }}} */ + +/* {{{ PHP_RSHUTDOWN_FUNCTION */ +PHP_RSHUTDOWN_FUNCTION(svn) +{ + if (SVN_G(pool)) { + svn_pool_destroy(SVN_G(pool)); + SVN_G(pool) = NULL; + } + return SUCCESS; +} +/* }}} */ + +/* {{{ PHP_MINFO_FUNCTION */ +PHP_MINFO_FUNCTION(svn) +{ + char vstr[128]; + + php_info_print_table_start(); + php_info_print_table_header(2, "svn support", "enabled"); + + php_svn_get_version(vstr, sizeof(vstr)); + + php_info_print_table_row(2, "svn client version", vstr); + php_info_print_table_row(2, "svn extension version", PHP_SVN_VERSION); + php_info_print_table_end(); + + /* Remove comments if you have entries in php.ini + DISPLAY_INI_ENTRIES(); + */ +} +/* }}} */ + +/* {{{ proto bool svn_checkout(string repository_url, string target_path [, int revision = SVN_REVISION_HEAD [, int flags]]) + Checks out a particular revision from a repository into target_path. */ +PHP_FUNCTION(svn_checkout) +{ + char *repos_url = NULL, *target_path = NULL; + const char *utf8_repos_url = NULL, *utf8_target_path = NULL; + const char *can_repos_url = NULL, *can_target_path = NULL; + int repos_url_len, target_path_len; + svn_error_t *err; + svn_opt_revision_t revision = { 0 }, peg_revision = { 0 }; + long flags = 0; + apr_pool_t *subpool; + const char *true_path; + + revision.value.number = svn_opt_revision_unspecified; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|ll", + &repos_url, &repos_url_len, &target_path, &target_path_len, &revision.value.number, &flags) == FAILURE) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_repos_url, repos_url, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + err = svn_utf_cstring_to_utf8 (&utf8_target_path, target_path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + can_repos_url= svn_path_canonicalize(utf8_repos_url, subpool); + can_target_path = svn_path_canonicalize(utf8_target_path, subpool); + + revision.kind = php_svn_get_revision_kind(revision); + + err = svn_opt_parse_path(&peg_revision, &true_path, can_repos_url, subpool); + if (err) { + php_svn_handle_error (err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + err = svn_client_checkout2 (NULL, + true_path, + can_target_path, + &peg_revision, + &revision, + !(flags & SVN_NON_RECURSIVE), + flags & SVN_IGNORE_EXTERNALS, + SVN_G(ctx), + subpool); + + if (err) { + php_svn_handle_error (err TSRMLS_CC); + RETVAL_FALSE; + } else { + RETVAL_TRUE; + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto string svn_cat(string repository_url [, int revision_no]) + Returns the contents of a file in a working copy or repository, optionally at revision_no. */ +PHP_FUNCTION(svn_cat) +{ + const char *url = NULL; + const char *utf8_url = NULL; + int url_len; + apr_size_t size; + svn_error_t *err; + svn_opt_revision_t revision = { 0 }, peg_revision = { 0 } ; + svn_stream_t *out = NULL; + svn_stringbuf_t *buf = NULL; + char *retdata =NULL; + apr_pool_t *subpool; + const char *true_path; + + revision.value.number = svn_opt_revision_unspecified; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", + &url, &url_len, &revision.value.number) == FAILURE) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + RETVAL_FALSE; + + revision.kind = php_svn_get_revision_kind(revision); + + buf = svn_stringbuf_create("", subpool); + if (!buf) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to allocate stringbuf"); + goto cleanup; + } + + out = svn_stream_from_stringbuf(buf, subpool); + if (!out) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to create svn stream"); + goto cleanup; + } + + err = svn_utf_cstring_to_utf8 (&utf8_url, url, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + goto cleanup; + } + + url = svn_path_canonicalize(utf8_url, subpool); + + err = svn_opt_parse_path(&peg_revision, &true_path, url, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + goto cleanup; + } + + err = svn_client_cat2(out, true_path, &peg_revision, &revision, SVN_G(ctx), subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + goto cleanup; + } + + retdata = emalloc(buf->len + 1); + size = buf->len; + err = svn_stream_read(out, retdata, &size); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + goto cleanup; + } + + retdata[size] = '\0'; + RETVAL_STRINGL(retdata, size, 0); + retdata = NULL; + +cleanup: + svn_pool_destroy(subpool); + if (retdata) efree(retdata); +} +/* }}} */ + + +/* {{{ proto array svn_ls(string repository_url [, int revision [, bool recurse [, bool peg]]]) + Returns a list of a directory in a working copy or repository, optionally at revision_no. */ +PHP_FUNCTION(svn_ls) +{ + const char *repos_url = NULL; + const char *utf8_repos_url = NULL; + int repos_url_len; + zend_bool recurse = 0, peg = 0; + svn_error_t *err; + svn_opt_revision_t revision = { 0 }; + apr_hash_t *dirents; + apr_array_header_t *array; + int i; + apr_pool_t *subpool; + svn_opt_revision_t peg_revision; + const char *true_path; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lbb", + &repos_url, &repos_url_len, &revision.value.number, &recurse, &peg) == FAILURE) { + return; + } + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_repos_url, repos_url, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + repos_url = svn_path_canonicalize(utf8_repos_url, subpool); + + revision.kind = php_svn_get_revision_kind(revision); + + err = svn_opt_parse_path(&peg_revision, &true_path, repos_url, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + err = svn_client_ls2 (&dirents, + true_path, + &peg_revision, + &revision, + recurse, + SVN_G(ctx), subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + array = svn_sort__hash (dirents, svn_sort_compare_items_as_paths, subpool); + array_init(return_value); + + for (i = 0; i < array->nelts; ++i) + { + const char *utf8_entryname; + svn_dirent_t *dirent; + svn_sort__item_t *item; + apr_time_t now = apr_time_now(); + apr_time_exp_t exp_time; + apr_status_t apr_err; + apr_size_t size; + char timestr[20]; + const char *utf8_timestr; + zval *row; + + item = &APR_ARRAY_IDX (array, i, svn_sort__item_t); + utf8_entryname = item->key; + dirent = apr_hash_get (dirents, utf8_entryname, item->klen); + + /* svn_time_to_human_cstring gives us something *way* too long + to use for this, so we have to roll our own. We include + the year if the entry's time is not within half a year. */ + apr_time_exp_lt (&exp_time, dirent->time); + if (apr_time_sec(now - dirent->time) < (365 * 86400 / 2) + && apr_time_sec(dirent->time - now) < (365 * 86400 / 2)) + { + apr_err = apr_strftime (timestr, &size, sizeof (timestr), + "%b %d %H:%M", &exp_time); + } else { + apr_err = apr_strftime (timestr, &size, sizeof (timestr), + "%b %d %Y", &exp_time); + } + + /* if that failed, just zero out the string and print nothing */ + if (apr_err) + timestr[0] = '\0'; + + /* we need it in UTF-8. */ + err = svn_utf_cstring_to_utf8 (&utf8_timestr, timestr, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + MAKE_STD_ZVAL(row); + array_init(row); + add_assoc_long(row, "created_rev", (long) dirent->created_rev); + add_assoc_string(row, "last_author", dirent->last_author ? (char *) dirent->last_author : " ? ", 1); + add_assoc_long(row, "size", dirent->size); + add_assoc_string(row, "time", timestr,1); + add_assoc_long(row, "time_t", apr_time_sec(dirent->time)); + /* this doesnt have a matching struct name */ + add_assoc_string(row, "name", (char *) utf8_entryname,1); + /* should this be a integer or something? - not very clear though.*/ + add_assoc_string(row, "type", (dirent->kind == svn_node_dir) ? "dir" : "file", 1); + + add_assoc_zval(return_value, (char *)utf8_entryname, row); + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +static svn_error_t * +php_svn_log_receiver (void *ibaton, + apr_hash_t *changed_paths, + svn_revnum_t rev, + const char *author, + const char *date, + const char *msg, + apr_pool_t *pool) +{ + struct php_svn_log_receiver_baton *baton = (struct php_svn_log_receiver_baton*) ibaton; + zval *row, *paths; + apr_array_header_t *sorted_paths; + int i; + TSRMLS_FETCH(); + + if (rev == 0) { + return SVN_NO_ERROR; + } + + MAKE_STD_ZVAL(row); + array_init(row); + add_assoc_long(row, "rev", (long) rev); + + if (author) { + add_assoc_string(row, "author", (char *) author, 1); + } + if (!baton->omit_messages && msg) { + add_assoc_string(row, "msg", (char *) msg, 1); + } + if (date) { + add_assoc_string(row, "date", (char *) date, 1); + } + + if (changed_paths) { + + + MAKE_STD_ZVAL(paths); + array_init(paths); + + sorted_paths = svn_sort__hash(changed_paths, svn_sort_compare_items_as_paths, pool); + + for (i = 0; i < sorted_paths->nelts; i++) + { + svn_sort__item_t *item; + svn_log_changed_path_t *log_item; + zval *zpaths; + const char *path; + + MAKE_STD_ZVAL(zpaths); + array_init(zpaths); + item = &(APR_ARRAY_IDX (sorted_paths, i, svn_sort__item_t)); + path = item->key; + log_item = apr_hash_get (changed_paths, item->key, item->klen); + + add_assoc_stringl(zpaths, "action", &(log_item->action), 1,1); + add_assoc_string(zpaths, "path", (char *) item->key, 1); + + if (log_item->copyfrom_path + && SVN_IS_VALID_REVNUM (log_item->copyfrom_rev)) { + add_assoc_string(zpaths, "copyfrom", (char *) log_item->copyfrom_path, 1); + add_assoc_long(zpaths, "rev", (long) log_item->copyfrom_rev); + } else { + + } + + add_next_index_zval(paths,zpaths); + } + add_assoc_zval(row,"paths",paths); + } + + add_next_index_zval(baton->result, row); + return SVN_NO_ERROR; +} + +/* {{{ proto array svn_log(string repository_url [, int start_revision = SVN_REVISION_HEAD [, int end_revision = SVN_REVISION_INITIAL [, int limit [, int flags ]]]]) + Returns the commit log messages on the working copy or repository object specified. */ +PHP_FUNCTION(svn_log) +{ + const char *url = NULL, *utf8_url = NULL; + int url_len; + + svn_error_t *err; + svn_opt_revision_t start_revision = { 0 }, end_revision = { 0 }; + + apr_array_header_t *targets; + + apr_pool_t *subpool; + long limit = 0; + long flags = SVN_DISCOVER_CHANGED_PATHS | SVN_STOP_ON_COPY; + struct php_svn_log_receiver_baton baton; + + svn_opt_revision_t peg_revision; + const char *true_path; + + start_revision.value.number = svn_opt_revision_unspecified; + end_revision.value.number = svn_opt_revision_unspecified; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|llll", + &url, &url_len, + &start_revision.value.number, &end_revision.value.number, + &limit, &flags) == FAILURE) { + return; + } + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_url, url, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + if ((ZEND_NUM_ARGS() > 2) && (end_revision.value.number == svn_opt_revision_unspecified)) { + end_revision.value.number = SVN_REVISION_INITIAL; + } + + start_revision.kind = php_svn_get_revision_kind(start_revision); + + if (start_revision.value.number == svn_opt_revision_unspecified) { + end_revision.kind = svn_opt_revision_number; + } else if (end_revision.value.number == svn_opt_revision_unspecified) { + end_revision = start_revision; + } else { + end_revision.kind = php_svn_get_revision_kind(end_revision); + } + + url = svn_path_canonicalize(utf8_url, subpool); + + err = svn_opt_parse_path(&peg_revision, &true_path, url, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + targets = apr_array_make (subpool, 1, sizeof(char *)); + + APR_ARRAY_PUSH(targets, const char *) = true_path; + array_init(return_value); + baton.result = (zval *)return_value; + baton.omit_messages = flags & SVN_OMIT_MESSAGES; + + err = svn_client_log3( + targets, + &peg_revision, + &start_revision, + &end_revision, + limit, + flags & SVN_DISCOVER_CHANGED_PATHS, + flags & SVN_STOP_ON_COPY, + php_svn_log_receiver, + (void *) &baton, + SVN_G(ctx), subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +static size_t php_apr_file_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC) +{ + apr_file_t *thefile = (apr_file_t*)stream->abstract; + apr_size_t nbytes = (apr_size_t)count; + + apr_file_write(thefile, buf, &nbytes); + + return (size_t)nbytes; +} + +static size_t php_apr_file_read(php_stream *stream, char *buf, size_t count TSRMLS_DC) +{ + apr_file_t *thefile = (apr_file_t*)stream->abstract; + apr_size_t nbytes = (apr_size_t)count; + + apr_file_read(thefile, buf, &nbytes); + + if (nbytes == 0) stream->eof = 1; + + return (size_t)nbytes; +} + +static int php_apr_file_close(php_stream *stream, int close_handle TSRMLS_DC) +{ + if (close_handle) { + apr_file_close((apr_file_t*)stream->abstract); + } + return 0; +} + +static int php_apr_file_flush(php_stream *stream TSRMLS_DC) +{ + apr_file_flush((apr_file_t*)stream->abstract); + return 0; +} + +static int php_apr_file_seek(php_stream *stream, off_t offset, int whence, off_t *newoffset TSRMLS_DC) +{ + apr_file_t *thefile = (apr_file_t*)stream->abstract; + apr_off_t off = (apr_off_t)offset; + + /* NB: apr_seek_where_t is defined using the standard SEEK_XXX whence values */ + apr_file_seek(thefile, whence, &off); + + *newoffset = (off_t)off; + return 0; +} + +static php_stream_ops php_apr_stream_ops = { + php_apr_file_write, + php_apr_file_read, + php_apr_file_close, + php_apr_file_flush, + "svn diff stream", + php_apr_file_seek, + NULL, /* cast */ + NULL, /* stat */ + NULL /* set_option */ +}; + +/* {{{ proto array svn_diff(string path1, int revision1, string path2, int revision2) + Produce diff output which describes the delta between path1/revision1 and path2/revision2. + Returns an array consisting of two streams: the first is the diff output and the second contains error stream output */ +PHP_FUNCTION(svn_diff) +{ + const char *tmp_dir; + char outname[256], errname[256]; + apr_pool_t *subpool; + apr_file_t *outfile = NULL, *errfile = NULL; + svn_error_t *err; + char *path1, *path2; + const char *utf8_path1 = NULL,*utf8_path2 = NULL; + const char *can_path1 = NULL,*can_path2 = NULL; + int path1len, path2len; + long rev1 = -1, rev2 = -1; + apr_array_header_t diff_options = { 0, 0, 0, 0, 0}; + svn_opt_revision_t revision1, revision2; + zend_bool ignore_content_type = 0; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl!sl!", + &path1, &path1len, &rev1, + &path2, &path2len, &rev2)) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + RETVAL_FALSE; + + if (rev1 <= 0) { + revision1.kind = svn_opt_revision_head; + } else { + revision1.kind = svn_opt_revision_number; + revision1.value.number = rev1; + } + if (rev2 <= 0) { + revision2.kind = svn_opt_revision_head; + } else { + revision2.kind = svn_opt_revision_number; + revision2.value.number = rev2; + } + + apr_temp_dir_get(&tmp_dir, subpool); + sprintf(outname, "%s/phpsvnXXXXXX", tmp_dir); + sprintf(errname, "%s/phpsvnXXXXXX", tmp_dir); + + /* use global pool, so stream lives after this function call */ + apr_file_mktemp(&outfile, outname, + APR_CREATE|APR_READ|APR_WRITE|APR_EXCL|APR_DELONCLOSE, + SVN_G(pool)); + + /* use global pool, so stream lives after this function call */ + apr_file_mktemp(&errfile, errname, + APR_CREATE|APR_READ|APR_WRITE|APR_EXCL|APR_DELONCLOSE, + SVN_G(pool)); + + err = svn_utf_cstring_to_utf8 (&utf8_path1, path1, subpool); + if (err) { + apr_file_close(errfile); + apr_file_close(outfile); + php_svn_handle_error(err TSRMLS_CC); + goto cleanup; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path2, path2, subpool); + if (err) { + apr_file_close(errfile); + apr_file_close(outfile); + php_svn_handle_error(err TSRMLS_CC); + goto cleanup; + } + + can_path1= svn_path_canonicalize(utf8_path1, subpool); + can_path2= svn_path_canonicalize(utf8_path2, subpool); + + err = svn_client_diff3(&diff_options, + can_path1, &revision1, + can_path2, &revision2, + 1, /* recurse */ + 0, /* ignore_ancestry */ + 0, /* no diff deleted */ + ignore_content_type, + APR_LOCALE_CHARSET, /* header encoding, for 1.4+ use SVN_APR_LOCALE_CHARSET */ + outfile, errfile, + SVN_G(ctx), subpool); + + if (err) { + apr_file_close(errfile); + apr_file_close(outfile); + php_svn_handle_error(err TSRMLS_CC); + } else { + zval *t; + php_stream *stm = NULL; + apr_off_t off = (apr_off_t)0; + + array_init(return_value); + + /* set the file pointer to the beginning of the file */ + apr_file_seek(outfile, APR_SET, &off); + apr_file_seek(errfile, APR_SET, &off); + + /* 'bless' the apr files into streams and return those */ + stm = php_stream_alloc(&php_apr_stream_ops, outfile, 0, "rw"); + MAKE_STD_ZVAL(t); + php_stream_to_zval(stm, t); + add_next_index_zval(return_value, t); + + stm = php_stream_alloc(&php_apr_stream_ops, errfile, 0, "rw"); + MAKE_STD_ZVAL(t); + php_stream_to_zval(stm, t); + add_next_index_zval(return_value, t); + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto bool svn_cleanup(string workingdir) + Recursively cleanup a working copy directory, finishing any incomplete operations, removing lockfiles, etc. */ +PHP_FUNCTION(svn_cleanup) +{ + const char *workingdir = NULL; + const char *utf8_workingdir = NULL; + int workingdir_len; + svn_error_t *err; + apr_pool_t *subpool; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &workingdir, &workingdir_len)) { + RETURN_FALSE; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_workingdir, workingdir, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + workingdir = svn_path_canonicalize(utf8_workingdir, subpool); + + err = svn_client_cleanup(workingdir, SVN_G(ctx), subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } else { + RETVAL_TRUE; + } + +cleanup: + svn_pool_destroy(subpool); + +} +/* }}} */ + +/* {{{ proto bool svn_revert(string path [, bool recursive = false]) + Revert any local changes to the path in a working copy. */ +PHP_FUNCTION(svn_revert) +{ + const char *path = NULL, *utf8_path = NULL; + long pathlen; + zend_bool recursive = 0; + svn_error_t *err; + apr_array_header_t *targets; + apr_pool_t *subpool; + + if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &path, &pathlen, &recursive) ) { + RETURN_FALSE; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + targets = apr_array_make (subpool, 1, sizeof(char *)); + + APR_ARRAY_PUSH(targets, const char *) = svn_path_canonicalize(utf8_path, subpool); + + err = svn_client_revert( + targets, + recursive, + SVN_G(ctx), + subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } else { + RETVAL_TRUE; + } + +cleanup: + svn_pool_destroy(subpool); + +} +/* }}} */ + +/* {{{ proto bool svn_resolved(string path [, bool recursive = false]) + Marks a conflicted path as resolved. */ +PHP_FUNCTION(svn_resolved) +{ + const char *path = NULL, *utf8_path = NULL; + long pathlen; + zend_bool recursive = 0; + svn_error_t *err; + apr_pool_t *subpool; + + if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &path, &pathlen, &recursive) ) { + RETURN_FALSE; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + RETVAL_FALSE; + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + path = svn_path_canonicalize(utf8_path, subpool); + + err = svn_client_resolved( + path, + recursive, + SVN_G(ctx), + subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } else { + RETVAL_TRUE; + } + +cleanup: + svn_pool_destroy(subpool); + +} +/* }}} */ + +static int replicate_hash(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *key) +{ + zval **val = (zval **)pDest; + apr_hash_t *hash = va_arg(args, apr_hash_t*); + + if (key->nKeyLength && Z_TYPE_PP(val) == IS_STRING) { + /* apr doesn't want the NUL terminator in its keys */ + apr_hash_set(hash, key->arKey, key->nKeyLength-1, Z_STRVAL_PP(val)); + } + + va_end(args); + + return ZEND_HASH_APPLY_KEEP; +} + +static apr_hash_t *replicate_zend_hash_to_apr_hash(zval *arr, apr_pool_t *pool TSRMLS_DC) +{ + apr_hash_t *hash; + + if (!arr) return NULL; + + hash = apr_hash_make(pool); + + zend_hash_apply_with_arguments(Z_ARRVAL_P(arr) TSRMLS_CC, replicate_hash, 1, hash); + + return hash; +} + +/* {{{ proto string svn_fs_revision_prop(resource fs, int revnum, string propname) + Fetches the value of property propname at revision revnum in the filesystem. */ +PHP_FUNCTION(svn_fs_revision_prop) +{ + zval *zfs; + long revnum; + struct php_svn_fs *fs; + svn_error_t *err; + svn_string_t *str; + char *propname; + int propnamelen; + apr_pool_t *subpool; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rls", + &zfs, &revnum, &propname, &propnamelen)) { + return; + } + + ZEND_FETCH_RESOURCE(fs, struct php_svn_fs *, &zfs, -1, "svn-fs", le_svn_fs); + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_fs_revision_prop(&str, fs->fs, revnum, propname, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else if (!str) { + /* the property is not found. return an empty string */ + RETVAL_STRINGL("", 0, 1); + } else { + RETVAL_STRINGL((char*)str->data, str->len, 1); + } + + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto int svn_fs_youngest_rev(resource fs) + Returns the number of the youngest revision in the filesystem. */ +PHP_FUNCTION(svn_fs_youngest_rev) +{ + zval *zfs; + struct php_svn_fs *fs; + svn_error_t *err; + svn_revnum_t revnum; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", + &zfs)) { + return; + } + + ZEND_FETCH_RESOURCE(fs, struct php_svn_fs *, &zfs, -1, "svn-fs", le_svn_fs); + + err = svn_fs_youngest_rev(&revnum, fs->fs, fs->repos->pool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETURN_FALSE; + } + + RETURN_LONG(revnum); +} +/* }}} */ + + +/* {{{ proto resource svn_fs_revision_root(resource fs, int revnum) + Get a handle on a specific revision of the repository root. */ +PHP_FUNCTION(svn_fs_revision_root) +{ + zval *zfs; + long revnum; + struct php_svn_fs *fs; + svn_fs_root_t *root; + svn_error_t *err; + struct php_svn_fs_root *resource; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", + &zfs, &revnum)) { + return; + } + + ZEND_FETCH_RESOURCE(fs, struct php_svn_fs *, &zfs, -1, "svn-fs", le_svn_fs); + + err = svn_fs_revision_root(&root, fs->fs, revnum, fs->repos->pool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETURN_FALSE; + } + + resource = emalloc(sizeof(*resource)); + resource->root = root; + resource->repos = fs->repos; + zend_list_addref(fs->repos->rsrc_id); + ZEND_REGISTER_RESOURCE(return_value, resource, le_svn_fs_root); +} +/* }}} */ + +static size_t php_svn_stream_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC) +{ + svn_stream_t *thefile = (svn_stream_t*)stream->abstract; + apr_size_t nbytes = (apr_size_t)count; + + svn_stream_write(thefile, buf, &nbytes); + + return (size_t)nbytes; +} + +static size_t php_svn_stream_read(php_stream *stream, char *buf, size_t count TSRMLS_DC) +{ + svn_stream_t *thefile = (svn_stream_t*)stream->abstract; + apr_size_t nbytes = (apr_size_t)count; + + svn_stream_read(thefile, buf, &nbytes); + + if (nbytes == 0) stream->eof = 1; + + return (size_t)nbytes; +} + +static int php_svn_stream_close(php_stream *stream, int close_handle TSRMLS_DC) +{ + if (close_handle) { + svn_stream_close((svn_stream_t*)stream->abstract); + } + return 0; +} + +static int php_svn_stream_flush(php_stream *stream TSRMLS_DC) +{ + return 0; +} + +static php_stream_ops php_svn_stream_ops = { + php_svn_stream_write, + php_svn_stream_read, + php_svn_stream_close, + php_svn_stream_flush, + "svn content stream", + NULL, /* seek */ + NULL, /* cast */ + NULL, /* stat */ + NULL /* set_option */ +}; + +/* {{{ proto resource svn_fs_file_contents(resource fsroot, string path) + Returns a stream to access the contents of the file at path. */ +PHP_FUNCTION(svn_fs_file_contents) +{ + zval *zfsroot; + struct php_svn_fs_root *fsroot; + const char *path = NULL; + const char *utf8_path = NULL; + int pathlen; + svn_error_t *err; + svn_stream_t *svnstm; + apr_pool_t *subpool; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", + &zfsroot, &path, &pathlen)) { + return; + } + + ZEND_FETCH_RESOURCE(fsroot, struct php_svn_fs_root*, &zfsroot, -1, "svn-fs-root", le_svn_fs_root); + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + path = svn_path_canonicalize(utf8_path, subpool); + + err = svn_fs_file_contents(&svnstm, fsroot->root, path, SVN_G(pool)); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + php_stream *stm; + stm = php_stream_alloc(&php_svn_stream_ops, svnstm, 0, "r"); + php_stream_to_zval(stm, return_value); + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto int svn_fs_file_length(resource fsroot, string path) + Tthe length of the file path in fsroot, in bytes. */ +PHP_FUNCTION(svn_fs_file_length) +{ + zval *zfsroot; + struct php_svn_fs_root *fsroot; + const char *path = NULL; + const char *utf8_path = NULL; + int pathlen; + svn_filesize_t len; + svn_error_t *err; + apr_pool_t *subpool; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", + &zfsroot, &path, &pathlen)) { + return; + } + + ZEND_FETCH_RESOURCE(fsroot, struct php_svn_fs_root*, &zfsroot, -1, "svn-fs-root", le_svn_fs_root); + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + path = svn_path_canonicalize(utf8_path, subpool); + + err = svn_fs_file_length(&len, fsroot->root, path, subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + /* TODO: 64 bit */ + RETVAL_LONG(len); + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto int svn_fs_node_prop(resource fsroot, string path, string propname) + Returns the value of property propname for a path. */ +PHP_FUNCTION(svn_fs_node_prop) +{ + zval *zfsroot; + struct php_svn_fs_root *fsroot; + const char *path = NULL; + const char *utf8_path = NULL; + char *propname; + int pathlen, propnamelen; + svn_error_t *err; + apr_pool_t *subpool; + svn_string_t *val; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", + &zfsroot, &path, &pathlen, &propname, &propnamelen)) { + return; + } + + ZEND_FETCH_RESOURCE(fsroot, struct php_svn_fs_root*, &zfsroot, -1, "svn-fs-root", le_svn_fs_root); + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + path = svn_path_canonicalize(utf8_path, subpool); + + err = svn_fs_node_prop(&val, fsroot->root, path, propname, subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + if (val != NULL && val->data != NULL) { + RETVAL_STRINGL((char *)val->data, val->len, 1); + } else { + RETVAL_EMPTY_STRING(); + } + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + + +/* {{{ proto int svn_fs_node_created_rev(resource fsroot, string path) + Returns the revision in which path under fsroot was created. */ +PHP_FUNCTION(svn_fs_node_created_rev) +{ + zval *zfsroot; + struct php_svn_fs_root *fsroot; + const char *path = NULL; + const char *utf8_path = NULL; + int pathlen; + svn_error_t *err; + apr_pool_t *subpool; + svn_revnum_t rev; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", + &zfsroot, &path, &pathlen)) { + return; + } + + ZEND_FETCH_RESOURCE(fsroot, struct php_svn_fs_root*, &zfsroot, -1, "svn-fs-root", le_svn_fs_root); + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + path = svn_path_canonicalize(utf8_path, subpool); + + err = svn_fs_node_created_rev(&rev, fsroot->root, path, subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + RETVAL_LONG(rev); + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto array svn_fs_dir_entries(resource fsroot, string path) + Lists the entries at path, the key is the name and the value is the node type. */ +PHP_FUNCTION(svn_fs_dir_entries) +{ + zval *zfsroot; + struct php_svn_fs_root *fsroot; + const char *path = NULL; + const char *utf8_path = NULL; + int pathlen; + svn_error_t *err; + apr_pool_t *subpool; + apr_hash_t *hash; + apr_hash_index_t *hi; + union { + void *vptr; + svn_fs_dirent_t *ent; + } pun; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", + &zfsroot, &path, &pathlen)) { + return; + } + + ZEND_FETCH_RESOURCE(fsroot, struct php_svn_fs_root*, &zfsroot, -1, "svn-fs-root", le_svn_fs_root); + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + path = svn_path_canonicalize(utf8_path, subpool); + + err = svn_fs_dir_entries(&hash, fsroot->root, path, subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + array_init(return_value); + + for (hi = apr_hash_first(subpool, hash); hi; hi = apr_hash_next(hi)) { + apr_hash_this(hi, NULL, NULL, &pun.vptr); + add_assoc_long(return_value, (char*)pun.ent->name, pun.ent->kind); + } + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto int svn_fs_check_path(resource fsroot, string path) + Determines what kind of node is present at path in a given repository fsroot. */ +PHP_FUNCTION(svn_fs_check_path) +{ + zval *zfsroot; + svn_node_kind_t kind; + struct php_svn_fs_root *fsroot; + const char *path = NULL; + const char *utf8_path = NULL; + int pathlen; + svn_error_t *err; + apr_pool_t *subpool; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", + &zfsroot, &path, &pathlen)) { + return; + } + + ZEND_FETCH_RESOURCE(fsroot, struct php_svn_fs_root*, &zfsroot, -1, "svn-fs-root", le_svn_fs_root); + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + path = svn_path_canonicalize(utf8_path, subpool); + + err = svn_fs_check_path(&kind, fsroot->root, path, subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + RETVAL_LONG(kind); + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto resource svn_repos_fs(resource repos) + Returns the filesystem resource associated with the repository resource repos. */ +PHP_FUNCTION(svn_repos_fs) +{ + struct php_svn_repos *repos = NULL; + struct php_svn_fs *resource = NULL; + zval *zrepos; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", + &zrepos)) { + return; + } + + ZEND_FETCH_RESOURCE(repos, struct php_svn_repos *, &zrepos, -1, "svn-repos", le_svn_repos); + + resource = emalloc(sizeof(*resource)); + resource->repos = repos; + zend_list_addref(repos->rsrc_id); + resource->fs = svn_repos_fs(repos->repos); + + ZEND_REGISTER_RESOURCE(return_value, resource, le_svn_fs); +} +/* }}} */ + +/* {{{ proto resource svn_repos_open(string path) + Acquires a shared lock on the repository at path. */ +PHP_FUNCTION(svn_repos_open) +{ + const char *path = NULL; + const char *utf8_path = NULL; + int pathlen; + apr_pool_t *subpool; + svn_error_t *err; + svn_repos_t *repos = NULL; + struct php_svn_repos *resource = NULL; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", + &path, &pathlen)) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + svn_pool_destroy(subpool); + RETURN_FALSE; + } + + path = svn_path_canonicalize(utf8_path, subpool); + + err = svn_repos_open(&repos, path, subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + } + + if (repos) { + resource = emalloc(sizeof(*resource)); + resource->pool = subpool; + resource->repos = repos; + ZEND_REGISTER_RESOURCE(return_value, resource, le_svn_repos); + } else { + svn_pool_destroy(subpool); + RETURN_FALSE; + } +} +/* }}} */ + +static svn_error_t *info_func (void *baton, const char *path, const svn_info_t *info, apr_pool_t *pool) { + zval *return_value = (zval*)baton; + zval *entry; + TSRMLS_FETCH(); + + MAKE_STD_ZVAL(entry); + array_init(entry); + + add_assoc_string(entry, "path", (char*)path, 1); + if (info) { + if (info->URL) { + add_assoc_string(entry, "url", (char *)info->URL, 1); + } + + add_assoc_long(entry, "revision", info->rev); + add_assoc_long(entry, "kind", info->kind); + + if (info->repos_root_URL) { + add_assoc_string(entry, "repos", (char *)info->repos_root_URL, 1); + } + + add_assoc_long(entry, "last_changed_rev", info->last_changed_rev); + add_assoc_string(entry, "last_changed_date", (char *) svn_time_to_cstring(info->last_changed_date, pool), 1); + + if (info->last_changed_author) { + add_assoc_string(entry, "last_changed_author", (char *)info->last_changed_author, 1); + } + + if (info->lock) { + add_assoc_bool(entry, "locked", 1); + } + + if (info->has_wc_info) { + add_assoc_bool(entry, "is_working_copy", 1); + } + } + + add_next_index_zval(return_value, entry); + + return NULL; +} + +/* {{{ proto array svn_info(string path [, bool recurse = false [, int revision = -1]]) + Returns subversion information about a working copy. */ +PHP_FUNCTION(svn_info) +{ + const char *path = NULL, *utf8_path = NULL; + int pathlen; + long revnum = -1; + apr_pool_t *subpool; + zend_bool recurse = 1; + svn_error_t *err; + svn_opt_revision_t peg_revision, revision; + const char *true_path; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|bl", + &path, &pathlen, &recurse, &revnum)) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + path = svn_path_canonicalize(utf8_path, subpool); + + revision.value.number = revnum; + revision.kind = !svn_path_is_url(path) && revnum == SVN_REVISION_UNSPECIFIED ? + svn_opt_revision_unspecified : php_svn_get_revision_kind(revision); + + if (svn_path_is_url(path)) + { + err = svn_opt_parse_path(&peg_revision, &true_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + } + else { + peg_revision.kind = svn_opt_revision_unspecified; + true_path = path; + } + + array_init(return_value); + err = svn_client_info(true_path, &peg_revision, &revision, info_func, return_value, recurse, SVN_G(ctx), subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } + +cleanup: + svn_pool_destroy(subpool); + +} +/* }}} */ + +/* {{{ proto resource svn_export(string frompath, string topath [, bool working_copy = true [, long revision = -1 ]) + Export the contents of either a working copy or repository into a 'clean' directory. + If working_copy is true it will export uncommitted files from a working copy. + To export revisions, you must set working copy to false - the default is to export HEAD. */ +PHP_FUNCTION(svn_export) +{ + const char *from = NULL, *to = NULL; + const char *utf8_from_path = NULL, *utf8_to_path = NULL; + int fromlen, tolen; + long revision_no = -1; + apr_pool_t *subpool; + zend_bool working_copy = 1; + svn_error_t *err; + svn_opt_revision_t revision, peg_revision; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|bl", + &from, &fromlen, &to, &tolen, &working_copy, &revision_no )) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_from_path, from, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + err = svn_utf_cstring_to_utf8 (&utf8_to_path, to, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + from = svn_path_canonicalize(utf8_from_path, subpool); + to = svn_path_canonicalize(utf8_to_path, subpool); + + if (working_copy) { + revision.kind = svn_opt_revision_working; + } else { + revision.value.number = revision_no; + revision.kind = php_svn_get_revision_kind(revision); + } + + peg_revision.kind = svn_opt_revision_unspecified; + + err = svn_client_export3(NULL, from, to, &peg_revision, &revision, TRUE, FALSE, TRUE, NULL, SVN_G(ctx), subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + RETVAL_TRUE; + } + +cleanup: + svn_pool_destroy(subpool); + +} +/* }}} */ + +/* {{{ proto resource svn_switch(string path, string url [, bool working_copy = true]) + Switch an existing working copy to another development URL within the same repository. */ +PHP_FUNCTION(svn_switch) +{ + const char *url = NULL, *path = NULL; + const char *utf8_url = NULL, *utf8_path = NULL; + int urllen, pathlen; + apr_pool_t *subpool; + zend_bool working_copy = 1; + svn_error_t *err; + svn_opt_revision_t revision; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|b", + &path, &pathlen, &url, &urllen, &working_copy)) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + err = svn_utf_cstring_to_utf8 (&utf8_url, url, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + path = svn_path_canonicalize(utf8_path, subpool); + url = svn_path_canonicalize(utf8_url, subpool); + + if (working_copy) { + revision.kind = svn_opt_revision_working; + } else { + revision.kind = svn_opt_revision_head; + } + + err = svn_client_switch(NULL, path, url, &revision, TRUE, SVN_G(ctx), subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + RETVAL_TRUE; + } + +cleanup: + svn_pool_destroy(subpool); + +} +/* }}} */ + +/* {{{ proto resource svn_copy(string log, string src_path, string destination_path [, bool working_copy = true [, int revision = -1]]) + Copies src path to destination path in a working copy or respository. */ +PHP_FUNCTION(svn_copy) +{ + const char *src_path = NULL, *dst_path = NULL; + const char *utf8_src_path = NULL, *utf8_dst_path = NULL; + char *log; + int src_pathlen, dst_pathlen, loglen; + long revnum = -1; + apr_pool_t *subpool; + zend_bool working_copy = 1; + svn_error_t *err; + svn_commit_info_t *info = NULL; + svn_opt_revision_t revision; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss|bl", + &log, &loglen, &src_path, &src_pathlen, &dst_path, &dst_pathlen, + &working_copy, &revnum)) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_src_path, src_path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + err = svn_utf_cstring_to_utf8 (&utf8_dst_path, dst_path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + src_path = svn_path_canonicalize(utf8_src_path, subpool); + dst_path = svn_path_canonicalize(utf8_dst_path, subpool); + + revision.value.number = revnum; + + if (working_copy) { + revision.kind = svn_opt_revision_working; + } else { + revision.kind = php_svn_get_revision_kind(revision); + } + + SVN_G(ctx)->log_msg_baton = log; + + err = svn_client_copy2(&info, (const char*)src_path, &revision, (const char*)dst_path, SVN_G(ctx), subpool); + SVN_G(ctx)->log_msg_baton = NULL; + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else if (info) { + array_init(return_value); + add_next_index_long(return_value, info->revision); + if (info->date) { + add_next_index_string(return_value, (char*)info->date, 1); + } else { + add_next_index_null(return_value); + } + + if (info->author) { + add_next_index_string(return_value, (char*)info->author, 1); + } else { + add_next_index_null(return_value); + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "commit didn't return any info"); + RETVAL_FALSE; + } + +cleanup: + svn_pool_destroy(subpool); + +} +/* }}} */ + + +static svn_error_t * +php_svn_blame_message_receiver (void *baton, + apr_int64_t line_no, + svn_revnum_t rev, + const char *author, + const char *date, + const char *line, + apr_pool_t *pool) +{ + zval *return_value = (zval *)baton, *row; + + TSRMLS_FETCH(); + + if (rev == 0) { + return SVN_NO_ERROR; + } + + MAKE_STD_ZVAL(row); + array_init(row); + + + add_assoc_long(row, "rev", (long) rev); + add_assoc_long(row, "line_no", line_no + 1); + add_assoc_string(row, "line", (char *) line, 1); + + if (author) { + add_assoc_string(row, "author", (char *) author, 1); + } + if (date) { + add_assoc_string(row, "date", (char *) date, 1); + } + + + add_next_index_zval(return_value, row); + return SVN_NO_ERROR; +} + +/* {{{ proto array svn_blame(string repository_url [, int revision_no]) + Returns the revision number, date and author for each line of a file in a working copy or repository.*/ +PHP_FUNCTION(svn_blame) +{ + const char *repos_url = NULL; + const char *utf8_repos_url = NULL; + int repos_url_len; + int revision = -1; + svn_error_t *err; + svn_opt_revision_t + start_revision = { 0 }, + end_revision = { 0 }, + peg_revision; + apr_pool_t *subpool; + const char *true_path; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &repos_url, &repos_url_len, &revision) == FAILURE) { + RETURN_FALSE; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_repos_url, repos_url, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + repos_url = svn_path_canonicalize(utf8_repos_url, subpool); + + start_revision.kind = svn_opt_revision_number; + start_revision.value.number = 0; + + if (revision == -1) { + end_revision.kind = svn_opt_revision_head; + } else { + end_revision.kind = svn_opt_revision_number; + end_revision.value.number = revision; + } + + err = svn_opt_parse_path(&peg_revision, &true_path, repos_url, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + array_init(return_value); + + err = svn_client_blame2( + true_path, + &peg_revision, + &start_revision, + &end_revision, + php_svn_blame_message_receiver, + (void *) return_value, + SVN_G(ctx), + subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + +cleanup: + svn_pool_destroy(subpool); + +} +/* }}} */ + +/* {{{ proto mixed svn_delete(string path [, bool force = true [, string message ]]) + Delete items from a working copy or repository. */ +PHP_FUNCTION(svn_delete) +{ + const char *path = NULL, *utf8_path = NULL, *logmsg = NULL; + int pathlen, logmsg_len; + apr_pool_t *subpool; + zend_bool force = 0; + svn_error_t *err; + svn_commit_info_t *info = NULL; + apr_array_header_t *targets; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|bs", + &path, &pathlen, &force, &logmsg, &logmsg_len)) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + targets = apr_array_make (subpool, 1, sizeof(char *)); + APR_ARRAY_PUSH(targets, const char *) = svn_path_canonicalize(utf8_path, subpool); + + SVN_G(ctx)->log_msg_baton = logmsg; + err = svn_client_delete2(&info, targets, force, SVN_G(ctx), subpool); + SVN_G(ctx)->log_msg_baton = NULL; + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else if (info) { + array_init(return_value); + add_next_index_long(return_value, info->revision); + if (info->date) { + add_next_index_string(return_value, (char*)info->date, 1); + } else { + add_next_index_null(return_value); + } + + if (info->author) { + add_next_index_string(return_value, (char*)info->author, 1); + } else { + add_next_index_null(return_value); + } + } else { + RETVAL_TRUE; + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto mixed svn_mkdir(string path [, string log_message ]) + Creates a directory in a working copy or repository. - log_message is optional for local mkdir */ +PHP_FUNCTION(svn_mkdir) +{ + const char *path = NULL, *utf8_path = NULL; + char *log_message = NULL; + int pathlen, loglen = 0; + apr_pool_t *subpool; + svn_error_t *err; + svn_commit_info_t *info = NULL; + apr_array_header_t *targets; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", + &path, &pathlen, &log_message, &loglen)) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + SVN_G(ctx)->log_msg_baton = NULL; + + if (loglen) { + SVN_G(ctx)->log_msg_baton = log_message; + } + + targets = apr_array_make (subpool, 1, sizeof(char *)); + + APR_ARRAY_PUSH(targets, const char *) = svn_path_canonicalize(utf8_path, subpool); + + err = svn_client_mkdir2(&info, targets, SVN_G(ctx), subpool); + + SVN_G(ctx)->log_msg_baton = NULL; + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + /* no error message set, info did not get returned, and no log was set - hence it's a local mkdir */ + if (!loglen && !info) { + RETVAL_TRUE; + goto cleanup; + } + + if (!info) { + RETVAL_FALSE; + goto cleanup; + } + + array_init(return_value); + add_next_index_long(return_value, info->revision); + if (info->date) { + add_next_index_string(return_value, (char*)info->date, 1); + } else { + add_next_index_null(return_value); + } + + if (info->author) { + add_next_index_string(return_value, (char*)info->author, 1); + } else { + add_next_index_null(return_value); + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto mixed svn_move(string src_path, string dst_path [, bool force]) + Moves src_path to dst_path in a working copy or repository. */ +PHP_FUNCTION(svn_move) +{ + const char *src_path = NULL, *utf8_src_path = NULL; + const char *dst_path = NULL, *utf8_dst_path = NULL; + int src_pathlen, dst_pathlen; + zend_bool force = 0; + apr_pool_t *subpool; + svn_error_t *err; + svn_commit_info_t *info = NULL; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|b", + &src_path, &src_pathlen, &dst_path, &dst_pathlen, &force)) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_src_path, src_path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + err = svn_utf_cstring_to_utf8 (&utf8_dst_path, dst_path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + src_path = svn_path_canonicalize(utf8_src_path, subpool); + dst_path = svn_path_canonicalize(utf8_dst_path, subpool); + + err = svn_client_move3(&info, src_path, dst_path, force, SVN_G(ctx), subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else if (info) { + array_init(return_value); + add_next_index_long(return_value, info->revision); + if (info->date) { + add_next_index_string(return_value, (char*)info->date, 1); + } else { + add_next_index_null(return_value); + } + + if (info->author) { + add_next_index_string(return_value, (char*)info->author, 1); + } else { + add_next_index_null(return_value); + } + } else { + RETVAL_TRUE; + } + +cleanup: + svn_pool_destroy(subpool); + +} +/* }}} */ + +/* {{{ proto mixed svn_proplist(string path [, bool recurse, [int revision]]) + Returns the properties of a path, the path can be a working copy or repository. */ +PHP_FUNCTION(svn_proplist) +{ + const char *path = NULL, *utf8_path = NULL; + int pathlen; + zend_bool recurse = 0; + apr_pool_t *subpool; + svn_error_t *err; + apr_array_header_t *props; + svn_opt_revision_t revision = { 0 }, peg_revision = { 0 }; + int i = 0; + const char *true_path; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|bl", + &path, &pathlen, &recurse, &revision.value.number)) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + path = svn_path_canonicalize(utf8_path, subpool); + + revision.kind = php_svn_get_revision_kind(revision); + + err = svn_opt_parse_path(&peg_revision, &true_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + err = svn_client_proplist2(&props, true_path, &peg_revision, &revision, recurse, SVN_G(ctx), subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + array_init(return_value); + + for (i = 0; i < props->nelts; ++i) { + svn_client_proplist_item_t *item + = ((svn_client_proplist_item_t **)props->elts)[i]; + zval *row; + apr_hash_index_t *hi; + + MAKE_STD_ZVAL(row); + array_init(row); + for (hi = apr_hash_first(subpool, item->prop_hash); hi; hi = apr_hash_next(hi)) { + const void *key; + void *val; + const char *pname; + svn_string_t *propval; + + apr_hash_this(hi, &key, NULL, &val); + pname = key; + propval = val; + + add_assoc_stringl(row, (char *)pname, (char *)propval->data, propval->len, 1); + } + add_assoc_zval(return_value, (char *)svn_path_local_style(item->node_name->data, subpool), row); + } + } + +cleanup: + svn_pool_destroy(subpool); + +} +/* }}} */ + +/* {{{ proto mixed svn_propget(string path, string property_name [, bool recurse [, int revision]]) + Returns an array of paths with a propery of property_name from a working copy or repository. */ +PHP_FUNCTION(svn_propget) +{ + const char *path = NULL, *utf8_path = NULL; + const char *propname = NULL; + int pathlen, propnamelen; + zend_bool recurse = 0; + apr_pool_t *subpool; + svn_error_t *err; + apr_hash_t *props; + svn_opt_revision_t revision = { 0 }, peg_revision = { 0 }; + apr_hash_index_t *hi; + const char *true_path; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|bl", + &path, &pathlen, &propname, &propnamelen, &recurse, &revision.value.number)) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + path = svn_path_canonicalize(utf8_path, subpool); + + revision.kind = php_svn_get_revision_kind(revision); + + err = svn_opt_parse_path(&peg_revision, &true_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + err = svn_client_propget2(&props, propname, true_path, &peg_revision, &revision, recurse, SVN_G(ctx), subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + + array_init(return_value); + for (hi = apr_hash_first(subpool, props); hi; hi = apr_hash_next(hi)) { + const void *key; + void *val; + const char *pname; + svn_string_t *propval; + zval *row; + + MAKE_STD_ZVAL(row); + array_init(row); + apr_hash_this(hi, &key, NULL, &val); + pname = key; + propval = val; + + add_assoc_stringl(row, (char *)propname, (char *)propval->data, propval->len, 1); + add_assoc_zval(return_value, (char *)svn_path_local_style(pname, subpool), row); + } + } + +cleanup: + svn_pool_destroy(subpool); + +} +/* }}} */ + + +/* {{{ proto mixed svn_revprop_get(string url, int revision, string property_name) + * Returns a revision property value */ +PHP_FUNCTION(svn_revprop_get) +{ + const char *url = NULL, *utf8_url = NULL; + const char *propname = NULL, * utf8_propname = NULL; + int urllen, propnamelen; + apr_pool_t *subpool; + svn_error_t *err; + svn_opt_revision_t revision = { 0 }; + svn_revnum_t result_rev; + svn_string_t* pval = NULL; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sls", + &url, &urllen, &revision.value.number, &propname, &propnamelen)) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_url, url, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + err = svn_utf_cstring_to_utf8 (&utf8_propname, propname, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + url = svn_path_canonicalize(utf8_url, subpool); + + revision.kind = php_svn_get_revision_kind(revision); + + err = svn_client_revprop_get ( + utf8_propname, &pval, + url, &revision, &result_rev, SVN_G(ctx), subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } else if (!pval) { + RETVAL_STRINGL("", 0, 1); + } else { + RETVAL_STRINGL((char*)pval->data, pval->len, 1); + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto mixed svn_revprop_set(string url, int revision, string property_name, string property_value, [, bool force]) + * Changes a revision property and returns the affected revision number */ +PHP_FUNCTION(svn_revprop_set) +{ + const char *url = NULL, *utf8_url = NULL; + const char *propname = NULL, *propval = NULL, * utf8_propname = NULL; + int urllen, propnamelen, propvallen; + apr_pool_t *subpool; + svn_error_t *err; + svn_opt_revision_t revision = { 0 }; + svn_string_t* pval = NULL; + svn_revnum_t result_rev; + zend_bool force = 0; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "slss|b", + &url, &urllen, &revision.value.number, &propname, &propnamelen, &propval, &propvallen, &force)) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_url, url, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + err = svn_utf_cstring_to_utf8 (&utf8_propname, propname, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + url = svn_path_canonicalize(utf8_url, subpool); + + revision.kind = php_svn_get_revision_kind(revision); + + err = svn_client_revprop_set ( + utf8_propname, svn_string_ncreate(propval, propvallen, subpool), + url, &revision, &result_rev, force, SVN_G(ctx), subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } else { + RETVAL_LONG(result_rev); + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto mixed svn_revprop_delete(string url, int revision, string property_name) + * Deletes a revision property */ +PHP_FUNCTION(svn_revprop_delete) +{ + const char *url = NULL, *utf8_url = NULL; + const char *propname = NULL, * utf8_propname = NULL; + int urllen, propnamelen; + apr_pool_t *subpool; + svn_error_t *err; + svn_opt_revision_t revision = { 0 }; + svn_string_t* pval = NULL; + svn_revnum_t result_rev; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sls", + &url, &urllen, &revision.value.number, &propname, &propnamelen)) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_url, url, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + err = svn_utf_cstring_to_utf8 (&utf8_propname, propname, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + url = svn_path_canonicalize(utf8_url, subpool); + + revision.kind = php_svn_get_revision_kind(revision); + + err = svn_client_revprop_set ( + utf8_propname, NULL, + url, &revision, &result_rev, FALSE, SVN_G(ctx), subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } else { + RETVAL_LONG(result_rev); + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto resource svn_repos_create(string path [, array config [, array fsconfig]]) + Create a new Subversion repository at path. */ +PHP_FUNCTION(svn_repos_create) +{ + const char *path = NULL; + const char *utf8_path = NULL; + int pathlen; + zval *config = NULL; + zval *fsconfig = NULL; + apr_hash_t *config_hash = NULL; + apr_hash_t *fsconfig_hash = NULL; + apr_pool_t *subpool; + svn_error_t *err; + svn_repos_t *repos = NULL; + struct php_svn_repos *resource = NULL; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a!a!", + &path, &pathlen, &config, &fsconfig)) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + svn_pool_destroy(subpool); + RETURN_FALSE; + } + + path = svn_path_canonicalize(utf8_path, subpool); + + config_hash = replicate_zend_hash_to_apr_hash(config, subpool TSRMLS_CC); + fsconfig_hash = replicate_zend_hash_to_apr_hash(fsconfig, subpool TSRMLS_CC); + + err = svn_repos_create(&repos, path, NULL, NULL, config_hash, fsconfig_hash, subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + } + + if (repos) { + resource = emalloc(sizeof(*resource)); + resource->pool = subpool; + resource->repos = repos; + ZEND_REGISTER_RESOURCE(return_value, resource, le_svn_repos); + } else { + svn_pool_destroy(subpool); + RETURN_FALSE; + } +} +/* }}} */ + +/* {{{ proto bool svn_repos_recover(string path) + Run database recovery procedures on the repository at path, returning the database to a consistent state. */ +PHP_FUNCTION(svn_repos_recover) +{ + const char *path = NULL; + const char *utf8_path = NULL; + int pathlen; + apr_pool_t *subpool; + svn_error_t *err; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", + &path, &pathlen)) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + path = svn_path_canonicalize(utf8_path, subpool); + + err = svn_repos_recover2(path, 0, NULL, NULL, subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + RETVAL_TRUE; + } + +cleanup: + svn_pool_destroy(subpool); + +} +/* }}} */ + +/* {{{ proto bool svn_repos_hotcopy(string src_path, string dst_path, bool cleanlogs) + Make a hot copy of the Subversion repository found at src_path to dst_path. */ +PHP_FUNCTION(svn_repos_hotcopy) +{ + const char *src_path = NULL, *dst_path = NULL; + const char *utf8_src_path = NULL, *utf8_dst_path = NULL; + int src_path_len, dst_path_len; + zend_bool cleanlogs; + apr_pool_t *subpool; + svn_error_t *err; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssb", + &src_path, &src_path_len, &dst_path, &dst_path_len, &cleanlogs)) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_src_path, src_path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + err = svn_utf_cstring_to_utf8 (&utf8_dst_path, dst_path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + src_path = svn_path_canonicalize(utf8_src_path, subpool); + dst_path = svn_path_canonicalize(utf8_dst_path, subpool); + + err = svn_repos_hotcopy(src_path, dst_path, cleanlogs, subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + RETVAL_TRUE; + } + +cleanup: + svn_pool_destroy(subpool); + +} +/* }}} */ + +static int replicate_array(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *key) +{ + zval **val = (zval **)pDest; + apr_pool_t *pool = (apr_pool_t*)va_arg(args, apr_pool_t*); + apr_array_header_t *arr = (apr_array_header_t*)va_arg(args, apr_array_header_t*); + + if (Z_TYPE_PP(val) == IS_STRING) { + APR_ARRAY_PUSH(arr, const char*) = apr_pstrdup(pool, Z_STRVAL_PP(val)); + } + + va_end(args); + + return ZEND_HASH_APPLY_KEEP; +} + + +static apr_array_header_t *replicate_zend_hash_to_apr_array(zval *arr, apr_pool_t *pool TSRMLS_DC) +{ + apr_array_header_t *apr_arr = apr_array_make(pool, zend_hash_num_elements(Z_ARRVAL_P(arr)), sizeof(const char*)); + + if (!apr_arr) return NULL; + + zend_hash_apply_with_arguments(Z_ARRVAL_P(arr) TSRMLS_CC, replicate_array, 2, pool, apr_arr); + + return apr_arr; +} + +/* {{{ proto array svn_commit(string log, mixed targets [, bool recursive]) + Commit files or directories from the local working copy into the repository */ +PHP_FUNCTION(svn_commit) +{ + char *log = NULL; + int loglen, pathlen; + const char *path = NULL; + const char *utf8_path = NULL; + zend_bool recursive = 1; + apr_pool_t *subpool; + svn_error_t *err; + svn_commit_info_t *info = NULL; + zval *targets = NULL; + apr_array_header_t *targets_array; + + if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "ss|b", + &log, &loglen, &path, &pathlen, &recursive)) { + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa|b", + &log, &loglen, &targets, &recursive)) { + return; + } + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + SVN_G(ctx)->log_msg_baton = log; + + if (path) { + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + path = svn_path_canonicalize(utf8_path, subpool); + + targets_array = apr_array_make (subpool, 1, sizeof(char *)); + APR_ARRAY_PUSH(targets_array, const char *) = path; + } else { + /* TODO: need to canonicalize the array */ + targets_array = replicate_zend_hash_to_apr_array(targets, subpool TSRMLS_CC); + } + + err = svn_client_commit3(&info, targets_array, recursive, 1, SVN_G(ctx), subpool); + SVN_G(ctx)->log_msg_baton = NULL; + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else if (info) { + array_init(return_value); + add_next_index_long(return_value, info->revision); + if (info->date) { + add_next_index_string(return_value, (char*)info->date, 1); + } else { + add_next_index_null(return_value); + } + + if (info->author) { + add_next_index_string(return_value, (char*)info->author, 1); + } else { + add_next_index_null(return_value); + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "commit didn't return any info"); + RETVAL_FALSE; + } + +cleanup: + + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto bool svn_lock(string comment, mixed targets [, bool steal_lock]) + Lock targets in the repository */ +PHP_FUNCTION(svn_lock) +{ + char *comment = NULL; + int comment_len, pathlen; + const char *path = NULL; + const char *utf8_path = NULL; + zend_bool steal_lock = 0; + apr_pool_t *subpool; + svn_error_t *err; + zval *targets = NULL; + apr_array_header_t *targets_array; + + if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "ss|b", + &comment, &comment_len, &path, &pathlen, &steal_lock)) { + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa|b", + &comment, &comment_len, &targets, &steal_lock)) { + return; + } + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + if (path) { + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + path = svn_path_canonicalize(utf8_path, subpool); + + targets_array = apr_array_make (subpool, 1, sizeof(char *)); + APR_ARRAY_PUSH(targets_array, const char *) = path; + } else { + /* TODO: need to canonicalize the array */ + targets_array = replicate_zend_hash_to_apr_array(targets, subpool TSRMLS_CC); + } + + err = svn_client_lock(targets_array, comment, steal_lock, SVN_G(ctx), subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + RETVAL_TRUE; + } + +cleanup: + svn_pool_destroy(subpool); + +} +/* }}} */ + +/* {{{ proto bool svn_unlock(mixed targets [, bool break_lock]) + Lock targets in the repository */ +PHP_FUNCTION(svn_unlock) +{ + int pathlen; + const char *path = NULL; + const char *utf8_path = NULL; + zend_bool break_lock = 0; + apr_pool_t *subpool; + svn_error_t *err; + zval *targets = NULL; + apr_array_header_t *targets_array; + + if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "s|b", + &path, &pathlen, &break_lock)) { + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|b", + &targets, &break_lock)) { + return; + } + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + if (path) { + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + path = svn_path_canonicalize(utf8_path, subpool); + + targets_array = apr_array_make (subpool, 1, sizeof(char *)); + APR_ARRAY_PUSH(targets_array, const char *) = path; + } else { + /* TODO: need to canonicalize the array */ + targets_array = replicate_zend_hash_to_apr_array(targets, subpool TSRMLS_CC); + } + + err = svn_client_unlock(targets_array, break_lock, SVN_G(ctx), subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + RETVAL_TRUE; + } + +cleanup: + svn_pool_destroy(subpool); + +} +/* }}} */ + +/* {{{ proto bool svn_add(string path [, bool recursive [, bool force]]) + Schedule the addition of a file or path to a working directory */ +PHP_FUNCTION(svn_add) +{ + const char *path = NULL; + const char *utf8_path = NULL; + int pathlen; + zend_bool recurse = 1, force = 0; + apr_pool_t *subpool; + svn_error_t *err; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|bb", + &path, &pathlen, &recurse, &force)) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + path = svn_path_canonicalize(utf8_path, subpool); + + err = svn_client_add2((const char*)path, recurse, force, SVN_G(ctx), subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + RETVAL_TRUE; + } + +cleanup: + svn_pool_destroy(subpool); + +} +/* }}} */ + +static void php_svn_status_receiver(void *baton, const char *path, svn_wc_status2_t *status) +{ + zval *return_value = (zval*)baton; + zval *entry; + TSRMLS_FETCH(); + + MAKE_STD_ZVAL(entry); + array_init(entry); + + add_assoc_string(entry, "path", (char*)path, 1); + if (status) { + add_assoc_long(entry, "text_status", status->text_status); + add_assoc_long(entry, "repos_text_status", status->repos_text_status); + add_assoc_long(entry, "prop_status", status->prop_status); + add_assoc_long(entry, "repos_prop_status", status->repos_prop_status); + add_assoc_bool(entry, "locked", status->locked); + add_assoc_bool(entry, "copied", status->copied); + add_assoc_bool(entry, "switched", status->switched); + + if (status->entry) { + if (status->entry->name) { + add_assoc_string(entry, "name", (char*)status->entry->name, 1); + } + if (status->entry->url) { + add_assoc_string(entry, "url", (char*)status->entry->url, 1); + } + if (status->entry->repos) { + add_assoc_string(entry, "repos", (char*)status->entry->repos, 1); + } + + add_assoc_long(entry, "revision", status->entry->revision); + add_assoc_long(entry, "kind", status->entry->kind); + add_assoc_long(entry, "schedule", status->entry->schedule); + if (status->entry->deleted) add_assoc_bool(entry, "deleted", status->entry->deleted); + if (status->entry->absent) add_assoc_bool(entry, "absent", status->entry->absent); + if (status->entry->incomplete) add_assoc_bool(entry, "incomplete", status->entry->incomplete); + + if (status->entry->copyfrom_url) { + add_assoc_string(entry, "copyfrom_url", (char*)status->entry->copyfrom_url, 1); + add_assoc_long(entry, "copyfrom_rev", status->entry->copyfrom_rev); + } + + if (status->entry->cmt_author) { + add_assoc_long(entry, "cmt_date", apr_time_sec(status->entry->cmt_date)); + add_assoc_long(entry, "cmt_rev", status->entry->cmt_rev); + add_assoc_string(entry, "cmt_author", (char*)status->entry->cmt_author, 1); + } + if (status->entry->prop_time) { + add_assoc_long(entry, "prop_time", apr_time_sec(status->entry->prop_time)); + } + + if (status->entry->text_time) { + add_assoc_long(entry, "text_time", apr_time_sec(status->entry->text_time)); + } + } + } + + add_next_index_zval(return_value, entry); +} + +/* {{{ proto array svn_status(string path [, int flags]]) + Returns the status of a working copy directory or a single file */ +PHP_FUNCTION(svn_status) +{ + const char *path = NULL; + const char *utf8_path = NULL; + int path_len; + long flags = 0; + apr_pool_t *subpool; + svn_error_t *err; + svn_revnum_t result_revision; + svn_opt_revision_t revision; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", + &path, &path_len, &flags)) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + path = svn_path_canonicalize(utf8_path, subpool); + + array_init(return_value); + revision.kind = svn_opt_revision_head; + + err = svn_client_status2( + &result_revision, + path, + &revision, + php_svn_status_receiver, + (void*)return_value, + !(flags & SVN_NON_RECURSIVE), + flags & SVN_ALL, + flags & SVN_SHOW_UPDATES, + flags & SVN_NO_IGNORE, + flags & SVN_IGNORE_EXTERNALS, + SVN_G(ctx), + subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } + +cleanup: + svn_pool_destroy(subpool); + +} +/* }}} */ + +/* {{{ proto int svn_update(string path [, int revno [, bool recurse]]) + Updates a working copy at path to revno */ +PHP_FUNCTION(svn_update) +{ + const char *path = NULL; + const char *utf8_path = NULL; + int pathlen; + zend_bool recurse = 1; + apr_pool_t *subpool; + svn_error_t *err; + svn_revnum_t result_rev; + svn_opt_revision_t rev; + long revno = -1; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lb", + &path, &pathlen, &revno, &recurse)) { + return; + } + + PHP_SVN_INIT_CLIENT(); + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) + { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + path = svn_path_canonicalize(utf8_path, subpool); + + rev.value.number = revno; + rev.kind = php_svn_get_revision_kind (rev); + + err = svn_client_update(&result_rev, path, &rev, recurse, + SVN_G(ctx), subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + RETVAL_LONG(result_rev); + } + +cleanup: + svn_pool_destroy(subpool); + +} +/* }}} */ + + +static void php_svn_get_version(char *buf, int buflen) +{ + const svn_version_t *vers; + vers = svn_client_version(); + + if (strlen(vers->tag)) + snprintf(buf, buflen, "%d.%d.%d#%s", vers->major, vers->minor, vers->patch, vers->tag); + else + snprintf(buf, buflen, "%d.%d.%d", vers->major, vers->minor, vers->patch); +} + +/* {{{ proto string svn_client_version() + Returns the version of the SVN client libraries */ +PHP_FUNCTION(svn_client_version) +{ + char vers[128]; + + if (ZEND_NUM_ARGS()) { + WRONG_PARAM_COUNT; + } + + php_svn_get_version(vers, sizeof(vers)); + RETURN_STRING(vers, 1); +} +/* }}} */ + +/* {{{ proto resource svn_repos_fs_begin_txn_for_commit(resource repos, long rev, string author, string log_msg) + create a new transaction */ +PHP_FUNCTION(svn_repos_fs_begin_txn_for_commit) +{ + svn_fs_txn_t *txn_p = NULL; + struct php_svn_repos_fs_txn *new_txn = NULL; + zval *zrepos; + struct php_svn_repos *repos = NULL; + svn_revnum_t rev; + char *author, *log_msg; + int author_len, log_msg_len; + apr_pool_t *subpool; + svn_error_t *err; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlss", + &zrepos, &rev, &author, &author_len, &log_msg, &log_msg_len)) { + return; + } + + ZEND_FETCH_RESOURCE(repos, struct php_svn_repos *, &zrepos, -1, "svn-repos", le_svn_repos); + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_repos_fs_begin_txn_for_commit(&txn_p, repos->repos, rev, author, log_msg, subpool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + } + + if (txn_p) { + new_txn = emalloc(sizeof(*new_txn)); + new_txn->repos = repos; + zend_list_addref(repos->rsrc_id); + new_txn->txn = txn_p; + + ZEND_REGISTER_RESOURCE(return_value, new_txn, le_svn_repos_fs_txn); + } else { + svn_pool_destroy(subpool); + RETURN_FALSE; + } +} +/* }}} */ + +/* {{{ proto int svn_repos_fs_commit_txn(resource txn) + Commits a transaction and returns the new revision */ +PHP_FUNCTION(svn_repos_fs_commit_txn) +{ + zval *ztxn; + struct php_svn_repos_fs_txn *txn; + const char *conflicts; + svn_revnum_t new_rev; + svn_error_t *err; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", + &ztxn)) { + RETURN_FALSE; + } + + ZEND_FETCH_RESOURCE(txn, struct php_svn_repos_fs_txn *, &ztxn, -1, "svn-repos-fs-txn", le_svn_repos_fs_txn); + + err = svn_repos_fs_commit_txn(&conflicts, txn->repos->repos, &new_rev, txn->txn, txn->repos->pool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETURN_FALSE; + } + + RETURN_LONG(new_rev); +} +/* }}} */ + +/* {{{ proto resource svn_fs_txn_root(resource txn) + Creates and returns a transaction root */ +PHP_FUNCTION(svn_fs_txn_root) +{ + svn_fs_root_t *root_p = NULL; + struct php_svn_fs_root *new_root = NULL; + zval *ztxn; + struct php_svn_repos_fs_txn *txn = NULL; + svn_error_t *err; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", + &ztxn)) { + return; + } + + ZEND_FETCH_RESOURCE(txn, struct php_svn_repos_fs_txn *, &ztxn, -1, "svn-fs-repos-txn", le_svn_repos_fs_txn); + + err = svn_fs_txn_root(&root_p, txn->txn, txn->repos->pool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETURN_FALSE; + } + + if (root_p) { + new_root = emalloc(sizeof(*new_root)); + new_root->repos = txn->repos; + zend_list_addref(txn->repos->rsrc_id); + new_root->root = root_p; + + ZEND_REGISTER_RESOURCE(return_value, new_root, le_svn_fs_root); + } else { + RETURN_FALSE; + } +} +/* }}} */ + +/* {{{ proto bool svn_fs_make_file(resource root, string path) + Create a new file named path in root, returns true on success, false otherwise */ +PHP_FUNCTION(svn_fs_make_file) +{ + zval *zroot; + struct php_svn_fs_root *root = NULL; + const char *path = NULL, *utf8_path = NULL; + int path_len; + svn_error_t *err; + apr_pool_t *subpool; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", + &zroot, &path, &path_len)) { + RETURN_FALSE; + } + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + path = svn_path_canonicalize(utf8_path, subpool); + + ZEND_FETCH_RESOURCE(root, struct php_svn_fs_root *, &zroot, -1, "svn-fs-root", le_svn_fs_root); + + err = svn_fs_make_file(root->root, path, root->repos->pool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + RETVAL_TRUE; + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto bool svn_fs_make_dir(resource root, string path) + Create a new directory named path in root, returns true on success, false otherwise */ +PHP_FUNCTION(svn_fs_make_dir) +{ + zval *zroot; + struct php_svn_fs_root *root = NULL; + const char *path = NULL, *utf8_path = NULL; + int path_len; + svn_error_t *err; + apr_pool_t *subpool; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", + &zroot, &path, &path_len)) { + RETURN_FALSE; + } + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + path = svn_path_canonicalize(utf8_path, subpool); + + ZEND_FETCH_RESOURCE(root, struct php_svn_fs_root *, &zroot, -1, "svn-fs-root", le_svn_fs_root); + + err = svn_fs_make_dir(root->root, path, root->repos->pool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + RETVAL_TRUE; + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + + +/* {{{ proto resource svn_fs_apply_text(resource root, string path) + Creates and returns a stream that will be used to replace + the content of an existing file. */ +PHP_FUNCTION(svn_fs_apply_text) +{ + zval *zroot; + struct php_svn_fs_root *root = NULL; + const char *path = NULL, *utf8_path = NULL; + int path_len; + svn_error_t *err; + svn_stream_t *stream_p = NULL; + apr_pool_t *subpool; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", + &zroot, &path, &path_len)) { + RETURN_FALSE; + } + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + path = svn_path_canonicalize(utf8_path, subpool); + + ZEND_FETCH_RESOURCE(root, struct php_svn_fs_root *, &zroot, -1, "svn-fs-root", le_svn_fs_root); + + err = svn_fs_apply_text(&stream_p, root->root, path, NULL, root->repos->pool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + if (stream_p) { + php_stream *stm; + stm = php_stream_alloc(&php_svn_stream_ops, stream_p, 0, "w"); + php_stream_to_zval(stm, return_value); + } else { + RETVAL_FALSE; + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto bool svn_fs_copy(resource from_root, string from_path, resourse to_root, string to_path) + Create a copy of from_path in from_root named to_path in to_root, returns true on success, false otherwise */ +PHP_FUNCTION(svn_fs_copy) +{ + zval *zfrom_root, *zto_root; + struct php_svn_fs_root *from_root, *to_root; + const char *from_path = NULL, *to_path = NULL; + const char *utf8_from_path = NULL, *utf8_to_path = NULL; + int from_path_len, to_path_len; + svn_error_t *err; + apr_pool_t *subpool; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsrs", + &zfrom_root, &from_path, &from_path_len, + &zto_root, &to_path, &to_path_len)) { + RETURN_FALSE; + } + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_from_path, from_path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + err = svn_utf_cstring_to_utf8 (&utf8_to_path, to_path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + from_path = svn_path_canonicalize(utf8_from_path, subpool); + to_path = svn_path_canonicalize(utf8_to_path, subpool); + + ZEND_FETCH_RESOURCE(from_root, struct php_svn_fs_root *, &zfrom_root, -1, "svn-fs-root", le_svn_fs_root); + ZEND_FETCH_RESOURCE(to_root, struct php_svn_fs_root *, &zto_root, -1, "svn-fs-root", le_svn_fs_root); + + err = svn_fs_copy(from_root->root, from_path, to_root->root, to_path, to_root->repos->pool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + RETVAL_TRUE; + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto bool svn_fs_delete(resource root, string path) + Delete the filesystem at path, return true on success, false otherwise */ +PHP_FUNCTION(svn_fs_delete) +{ + zval *zroot; + struct php_svn_fs_root *root = NULL; + const char *path = NULL, *utf8_path = NULL; + int path_len; + svn_error_t *err; + apr_pool_t *subpool; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", + &zroot, &path, &path_len)) { + RETURN_FALSE; + } + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + path = svn_path_canonicalize(utf8_path, subpool); + + ZEND_FETCH_RESOURCE(root, struct php_svn_fs_root *, &zroot, -1, "svn-fs-root", le_svn_fs_root); + + err = svn_fs_delete(root->root, path, root->repos->pool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + RETVAL_TRUE; + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto resource svn_fs_begin_txn2(resource repos, long rev) + Begin a new transaction on the filesystem, based on the existing revision specified. */ +PHP_FUNCTION(svn_fs_begin_txn2) +{ + svn_fs_txn_t *txn_p = NULL; + struct php_svn_repos_fs_txn *new_txn = NULL; + zval *zfs; + struct php_svn_fs *fs = NULL; + svn_revnum_t rev; + svn_error_t *err; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", + &zfs, &rev)) { + return; + } + + ZEND_FETCH_RESOURCE(fs, struct php_svn_fs *, &zfs, -1, "svn-fs", le_svn_fs); + + err = svn_fs_begin_txn2(&txn_p, fs->fs, rev, 0, SVN_G(pool)); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETURN_FALSE; + } + + if (txn_p) { + new_txn = emalloc(sizeof(*new_txn)); + new_txn->repos = fs->repos; + zend_list_addref(fs->repos->rsrc_id); + new_txn->txn = txn_p; + + ZEND_REGISTER_RESOURCE(return_value, new_txn, le_svn_repos_fs_txn); + } else { + RETURN_FALSE; + } +} +/* }}} */ + +/* {{{ proto bool svn_fs_is_file(resource root, string path) + Returns true if path in root is a file, false otherwise */ +PHP_FUNCTION(svn_fs_is_file) +{ + zval *zroot; + struct php_svn_fs_root *root = NULL; + const char *path = NULL, *utf8_path = NULL; + int path_len; + svn_error_t *err; + svn_boolean_t is_file; + apr_pool_t *subpool; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", + &zroot, &path, &path_len)) { + RETURN_FALSE; + } + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + path = svn_path_canonicalize(utf8_path, subpool); + + ZEND_FETCH_RESOURCE(root, struct php_svn_fs_root *, &zroot, -1, "svn-fs-root", le_svn_fs_root); + + err = svn_fs_is_file(&is_file, root->root, path, root->repos->pool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + RETVAL_BOOL(is_file); + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto bool svn_fs_is_dir(resource root, string path) + Returns true if path in root is a directory, false otherwise */ +PHP_FUNCTION(svn_fs_is_dir) +{ + zval *zroot; + struct php_svn_fs_root *root = NULL; + const char *path = NULL, *utf8_path = NULL; + int path_len; + svn_error_t *err; + svn_boolean_t is_dir; + apr_pool_t *subpool; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", + &zroot, &path, &path_len)) { + RETURN_FALSE; + } + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + path = svn_path_canonicalize(utf8_path, subpool); + + ZEND_FETCH_RESOURCE(root, struct php_svn_fs_root *, &zroot, -1, "svn-fs-root", le_svn_fs_root); + + err = svn_fs_is_dir(&is_dir, root->root, path, root->repos->pool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + RETVAL_BOOL(is_dir); + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto bool svn_fs_change_node_prop(resource root, string path, string name, string value) + Change a node's property's value, or add/delete a property. (use NULL as value to delete) Returns true on success. */ +PHP_FUNCTION(svn_fs_change_node_prop) +{ + zval *zroot, *value; + struct php_svn_fs_root *root = NULL; + const char *path = NULL, *utf8_path = NULL; + char *name; + int path_len, name_len, value_len; + svn_string_t *svn_value = NULL; + svn_error_t *err; + apr_pool_t *subpool; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rssz", + &zroot, &path, &path_len, &name, &name_len, &value)) { + RETURN_FALSE; + } + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path, path, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + path = svn_path_canonicalize(utf8_path, subpool); + + ZEND_FETCH_RESOURCE(root, struct php_svn_fs_root *, &zroot, -1, "svn-fs-root", le_svn_fs_root); + + if (Z_TYPE_P(value) != IS_NULL) { + convert_to_string_ex(&value); + svn_value = emalloc(sizeof(*svn_value)); + svn_value->data = Z_STRVAL_P(value); + svn_value->len = Z_STRLEN_P(value); + } + + err = svn_fs_change_node_prop(root->root, path, name, svn_value, + root->repos->pool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else { + RETVAL_TRUE; + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto bool svn_fs_contents_changed(resource root1, string path1, resource root2, string path2) + Returns true if the contents at path1 under root1 differ from those at path2 under root2, or set it to 0 if they are the same */ +PHP_FUNCTION(svn_fs_contents_changed) +{ + zval *zroot1, *zroot2; + struct php_svn_fs_root *root1 = NULL, *root2 = NULL; + const char *path1 = NULL, *path2 = NULL; + const char *utf8_path1 = NULL, *utf8_path2 = NULL; + int path1_len, path2_len; + svn_boolean_t changed; + svn_error_t *err; + apr_pool_t *subpool; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsrs", + &zroot1, &path1, &path1_len, + &zroot2, &path2, &path2_len)) { + RETURN_FALSE; + } + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path1, path1, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + err = svn_utf_cstring_to_utf8 (&utf8_path2, path2, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + path1 = svn_path_canonicalize(utf8_path1, subpool); + path2 = svn_path_canonicalize(utf8_path2, subpool); + + ZEND_FETCH_RESOURCE(root1, struct php_svn_fs_root *, &zroot1, -1, "svn-fs-root", le_svn_fs_root); + ZEND_FETCH_RESOURCE(root2, struct php_svn_fs_root *, &zroot2, -1, "svn-fs-root", le_svn_fs_root); + + err = svn_fs_contents_changed(&changed, root1->root, path1, + root2->root, path2, root1->repos->pool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else if (changed == 1) { + RETVAL_TRUE; + } else { + RETVAL_FALSE; + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto bool svn_fs_props_changed(resource root1, string path1, resource root2, string path2) + Returns true if the properties of two path/root combinations are different, else false. */ +PHP_FUNCTION(svn_fs_props_changed) +{ + zval *zroot1, *zroot2; + struct php_svn_fs_root *root1 = NULL, *root2 = NULL; + const char *path1 = NULL, *path2 = NULL; + const char *utf8_path1 = NULL, *utf8_path2 = NULL; + int path1_len, path2_len; + svn_boolean_t changed; + svn_error_t *err; + apr_pool_t *subpool; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsrs", + &zroot1, &path1, &path1_len, + &zroot2, &path2, &path2_len)) { + RETURN_FALSE; + } + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_utf_cstring_to_utf8 (&utf8_path1, path1, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + err = svn_utf_cstring_to_utf8 (&utf8_path2, path2, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + goto cleanup; + } + + path1 = svn_path_canonicalize(utf8_path1, subpool); + path2 = svn_path_canonicalize(utf8_path2, subpool); + + ZEND_FETCH_RESOURCE(root1, struct php_svn_fs_root *, &zroot1, -1, "svn-fs-root", le_svn_fs_root); + ZEND_FETCH_RESOURCE(root2, struct php_svn_fs_root *, &zroot2, -1, "svn-fs-root", le_svn_fs_root); + + err = svn_fs_props_changed(&changed, root1->root, path1, + root2->root, path2, root1->repos->pool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else if (changed == 1) { + RETVAL_TRUE; + } else { + RETVAL_FALSE; + } + +cleanup: + svn_pool_destroy(subpool); +} +/* }}} */ + +/* {{{ proto bool svn_fs_abort_txn(resource txn) + Aborts a transaction, returns true on success, false otherwise */ +PHP_FUNCTION(svn_fs_abort_txn) +{ + zval *ztxn; + struct php_svn_repos_fs_txn *txn; + svn_error_t *err; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", + &ztxn)) { + return; + } + + ZEND_FETCH_RESOURCE(txn, struct php_svn_repos_fs_txn *, &ztxn, -1, "svn-repos-fs-txn", le_svn_repos_fs_txn); + + err = svn_fs_abort_txn(txn->txn, txn->repos->pool); + + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETURN_FALSE; + } else { + RETURN_TRUE; + } +} +/* }}} */ + +/* {{{ proto resource svn_fs_open_txn(resource fs, string name) + Opens a transaction, returns a transaction resource on success, false otherwise */ +PHP_FUNCTION(svn_fs_open_txn) +{ + zval *zfs; + struct php_svn_fs *fs; + zval *ztxn; + struct php_svn_repos_fs_txn *txn; + svn_error_t *err; + const char *name = NULL; + int name_len; + apr_pool_t *subpool; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", + &zfs, &name, &name_len)) { + return; + } + + ZEND_FETCH_RESOURCE(fs, struct php_svn_fs *, &zfs, -1, "svn-fs", le_svn_fs); + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_fs_open_txn (&txn, fs->fs, name, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else if (txn) { + struct php_svn_repos_fs_txn *new_txn; + + new_txn = emalloc(sizeof(*new_txn)); + new_txn->repos = fs->repos; + zend_list_addref(fs->repos->rsrc_id); + new_txn->txn = txn; + + ZEND_REGISTER_RESOURCE(return_value, new_txn, le_svn_repos_fs_txn); + } else { + RETVAL_FALSE; + } + + svn_pool_destroy (subpool); +} +/* }}} */ + +/* {{{ proto string svn_fs_txn_prop(resource txn, string propname) + Fetches the value of property propname at a transaction. */ +PHP_FUNCTION(svn_fs_txn_prop) +{ + zval *ztxn; + struct php_svn_repos_fs_txn *txn; + svn_error_t *err; + svn_string_t *str; + char *propname; + int propnamelen; + apr_pool_t *subpool; + + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", + &ztxn, &propname, &propnamelen)) { + return; + } + + ZEND_FETCH_RESOURCE(txn, struct php_svn_repos_fs_txn *, &ztxn, -1, "svn-repos-fs-txn", le_svn_repos_fs_txn); + + subpool = svn_pool_create(SVN_G(pool)); + if (!subpool) { + RETURN_FALSE; + } + + err = svn_fs_txn_prop(&str, txn->txn, propname, subpool); + if (err) { + php_svn_handle_error(err TSRMLS_CC); + RETVAL_FALSE; + } else if (!str) { + /* the property is not found. return an empty string */ + RETVAL_STRINGL("", 0, 1); + } else { + RETVAL_STRINGL((char*)str->data, str->len, 1); + } + + svn_pool_destroy(subpool); +} +/* }}} */ + + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ diff --git a/codepot/pecl-svn/svn.ini b/codepot/pecl-svn/svn.ini new file mode 100644 index 00000000..b9e3db48 --- /dev/null +++ b/codepot/pecl-svn/svn.ini @@ -0,0 +1,2 @@ +; Enable svn extension module +extension=svn.so diff --git a/codepot/sbin/Makefile.in b/codepot/sbin/Makefile.in index 7d158f64..9c77ebe3 100644 --- a/codepot/sbin/Makefile.in +++ b/codepot/sbin/Makefile.in @@ -140,6 +140,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PHPEXTDIR = @PHPEXTDIR@ +PHPEXTINIDIR = @PHPEXTINIDIR@ PREFIX = @PREFIX@ RM = @RM@ RMDIR = @RMDIR@ @@ -183,6 +185,8 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +phpextdir = @phpextdir@ +phpextinidir = @phpextinidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ diff --git a/codepot/sbin/codepot-user.in b/codepot/sbin/codepot-user.in index 301f8461..766f9290 100644 --- a/codepot/sbin/codepot-user.in +++ b/codepot/sbin/codepot-user.in @@ -28,7 +28,9 @@ sub get_config database_password => $cfg->param ("database_password"), database_name => $cfg->param ("database_name"), database_driver => $cfg->param ("database_driver"), - database_prefix => $cfg->param ("database_prefix") + database_prefix => $cfg->param ("database_prefix"), + + codepot_user_executor => $cfg->param("codepot_user_executor") }; return $config; @@ -241,6 +243,31 @@ if (!defined($cfg)) exit (1); } +my $allowed_to_execute = 1; +my @executors = split (/\s*,\s*/, $cfg->{codepot_user_executor}); +if (scalar(@executors) > 0) +{ + for my $executor (@executors) + { + my $uid = getpwnam ($executor); + if (defined($uid) && $> == $uid) + { + $allowed_to_execute = 1; + last; + } + else + { + $allowed_to_execute = 0; + } + } +} + +if ($allowed_to_execute == 0) +{ + print (STDERR "Not allowed to run this program\n"); + exit (1); +} + my $dbh = open_database ($cfg); if (!defined($dbh)) { diff --git a/codepot/src/Makefile.in b/codepot/src/Makefile.in index 914e70a6..5722f9a5 100644 --- a/codepot/src/Makefile.in +++ b/codepot/src/Makefile.in @@ -180,6 +180,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PHPEXTDIR = @PHPEXTDIR@ +PHPEXTINIDIR = @PHPEXTINIDIR@ PREFIX = @PREFIX@ RM = @RM@ RMDIR = @RMDIR@ @@ -223,6 +225,8 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +phpextdir = @phpextdir@ +phpextinidir = @phpextinidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ diff --git a/codepot/src/codepot/Makefile.in b/codepot/src/codepot/Makefile.in index bce74dfd..1038a9a9 100644 --- a/codepot/src/codepot/Makefile.in +++ b/codepot/src/codepot/Makefile.in @@ -179,6 +179,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PHPEXTDIR = @PHPEXTDIR@ +PHPEXTINIDIR = @PHPEXTINIDIR@ PREFIX = @PREFIX@ RM = @RM@ RMDIR = @RMDIR@ @@ -222,6 +224,8 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +phpextdir = @phpextdir@ +phpextinidir = @phpextinidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ diff --git a/codepot/src/codepot/config/Makefile.in b/codepot/src/codepot/config/Makefile.in index f5d5a08d..52ab5de6 100644 --- a/codepot/src/codepot/config/Makefile.in +++ b/codepot/src/codepot/config/Makefile.in @@ -139,6 +139,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PHPEXTDIR = @PHPEXTDIR@ +PHPEXTINIDIR = @PHPEXTINIDIR@ PREFIX = @PREFIX@ RM = @RM@ RMDIR = @RMDIR@ @@ -182,6 +184,8 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +phpextdir = @phpextdir@ +phpextinidir = @phpextinidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ diff --git a/codepot/src/codepot/controllers/Makefile.in b/codepot/src/codepot/controllers/Makefile.in index 789a2ea5..7bf722dd 100644 --- a/codepot/src/codepot/controllers/Makefile.in +++ b/codepot/src/codepot/controllers/Makefile.in @@ -139,6 +139,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PHPEXTDIR = @PHPEXTDIR@ +PHPEXTINIDIR = @PHPEXTINIDIR@ PREFIX = @PREFIX@ RM = @RM@ RMDIR = @RMDIR@ @@ -182,6 +184,8 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +phpextdir = @phpextdir@ +phpextinidir = @phpextinidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ diff --git a/codepot/src/codepot/errors/Makefile.in b/codepot/src/codepot/errors/Makefile.in index 854f1dc2..8dab38e2 100644 --- a/codepot/src/codepot/errors/Makefile.in +++ b/codepot/src/codepot/errors/Makefile.in @@ -139,6 +139,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PHPEXTDIR = @PHPEXTDIR@ +PHPEXTINIDIR = @PHPEXTINIDIR@ PREFIX = @PREFIX@ RM = @RM@ RMDIR = @RMDIR@ @@ -182,6 +184,8 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +phpextdir = @phpextdir@ +phpextinidir = @phpextinidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ diff --git a/codepot/src/codepot/helpers/Makefile.in b/codepot/src/codepot/helpers/Makefile.in index 406955e7..f8d7fc89 100644 --- a/codepot/src/codepot/helpers/Makefile.in +++ b/codepot/src/codepot/helpers/Makefile.in @@ -139,6 +139,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PHPEXTDIR = @PHPEXTDIR@ +PHPEXTINIDIR = @PHPEXTINIDIR@ PREFIX = @PREFIX@ RM = @RM@ RMDIR = @RMDIR@ @@ -182,6 +184,8 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +phpextdir = @phpextdir@ +phpextinidir = @phpextinidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ diff --git a/codepot/src/codepot/hooks/Makefile.in b/codepot/src/codepot/hooks/Makefile.in index aaa5492d..bc1eafa6 100644 --- a/codepot/src/codepot/hooks/Makefile.in +++ b/codepot/src/codepot/hooks/Makefile.in @@ -139,6 +139,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PHPEXTDIR = @PHPEXTDIR@ +PHPEXTINIDIR = @PHPEXTINIDIR@ PREFIX = @PREFIX@ RM = @RM@ RMDIR = @RMDIR@ @@ -182,6 +184,8 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +phpextdir = @phpextdir@ +phpextinidir = @phpextinidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ diff --git a/codepot/src/codepot/language/Makefile.in b/codepot/src/codepot/language/Makefile.in index 6ffa7b67..f9692444 100644 --- a/codepot/src/codepot/language/Makefile.in +++ b/codepot/src/codepot/language/Makefile.in @@ -149,6 +149,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PHPEXTDIR = @PHPEXTDIR@ +PHPEXTINIDIR = @PHPEXTINIDIR@ PREFIX = @PREFIX@ RM = @RM@ RMDIR = @RMDIR@ @@ -192,6 +194,8 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +phpextdir = @phpextdir@ +phpextinidir = @phpextinidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ diff --git a/codepot/src/codepot/language/english/Makefile.in b/codepot/src/codepot/language/english/Makefile.in index 733fcf7b..77e5d6de 100644 --- a/codepot/src/codepot/language/english/Makefile.in +++ b/codepot/src/codepot/language/english/Makefile.in @@ -139,6 +139,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PHPEXTDIR = @PHPEXTDIR@ +PHPEXTINIDIR = @PHPEXTINIDIR@ PREFIX = @PREFIX@ RM = @RM@ RMDIR = @RMDIR@ @@ -182,6 +184,8 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +phpextdir = @phpextdir@ +phpextinidir = @phpextinidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ diff --git a/codepot/src/codepot/language/indonesian/Makefile.in b/codepot/src/codepot/language/indonesian/Makefile.in index 05976b18..e5546165 100644 --- a/codepot/src/codepot/language/indonesian/Makefile.in +++ b/codepot/src/codepot/language/indonesian/Makefile.in @@ -139,6 +139,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PHPEXTDIR = @PHPEXTDIR@ +PHPEXTINIDIR = @PHPEXTINIDIR@ PREFIX = @PREFIX@ RM = @RM@ RMDIR = @RMDIR@ @@ -182,6 +184,8 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +phpextdir = @phpextdir@ +phpextinidir = @phpextinidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ diff --git a/codepot/src/codepot/language/korean/Makefile.in b/codepot/src/codepot/language/korean/Makefile.in index 179bb447..98efa51d 100644 --- a/codepot/src/codepot/language/korean/Makefile.in +++ b/codepot/src/codepot/language/korean/Makefile.in @@ -139,6 +139,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PHPEXTDIR = @PHPEXTDIR@ +PHPEXTINIDIR = @PHPEXTINIDIR@ PREFIX = @PREFIX@ RM = @RM@ RMDIR = @RMDIR@ @@ -182,6 +184,8 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +phpextdir = @phpextdir@ +phpextinidir = @phpextinidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ diff --git a/codepot/src/codepot/libraries/Makefile.in b/codepot/src/codepot/libraries/Makefile.in index a98a4d74..4c489ea0 100644 --- a/codepot/src/codepot/libraries/Makefile.in +++ b/codepot/src/codepot/libraries/Makefile.in @@ -139,6 +139,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PHPEXTDIR = @PHPEXTDIR@ +PHPEXTINIDIR = @PHPEXTINIDIR@ PREFIX = @PREFIX@ RM = @RM@ RMDIR = @RMDIR@ @@ -182,6 +184,8 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +phpextdir = @phpextdir@ +phpextinidir = @phpextinidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ diff --git a/codepot/src/codepot/models/Makefile.in b/codepot/src/codepot/models/Makefile.in index 23285b5d..0f77ed06 100644 --- a/codepot/src/codepot/models/Makefile.in +++ b/codepot/src/codepot/models/Makefile.in @@ -139,6 +139,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PHPEXTDIR = @PHPEXTDIR@ +PHPEXTINIDIR = @PHPEXTINIDIR@ PREFIX = @PREFIX@ RM = @RM@ RMDIR = @RMDIR@ @@ -182,6 +184,8 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +phpextdir = @phpextdir@ +phpextinidir = @phpextinidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ diff --git a/codepot/src/codepot/views/Makefile.in b/codepot/src/codepot/views/Makefile.in index 1625f9d5..324e4aa9 100644 --- a/codepot/src/codepot/views/Makefile.in +++ b/codepot/src/codepot/views/Makefile.in @@ -139,6 +139,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PHPEXTDIR = @PHPEXTDIR@ +PHPEXTINIDIR = @PHPEXTINIDIR@ PREFIX = @PREFIX@ RM = @RM@ RMDIR = @RMDIR@ @@ -182,6 +184,8 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +phpextdir = @phpextdir@ +phpextinidir = @phpextinidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ diff --git a/codepot/src/codepot/views/code_blame.php b/codepot/src/codepot/views/code_blame.php index ba331df9..0cb2611f 100644 --- a/codepot/src/codepot/views/code_blame.php +++ b/codepot/src/codepot/views/code_blame.php @@ -3,21 +3,21 @@ - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - - - + + + + + + + + <?php if ($headpath == '') diff --git a/codepot/src/codepot/views/code_file.php b/codepot/src/codepot/views/code_file.php index 31f14c3d..74bcd03d 100644 --- a/codepot/src/codepot/views/code_file.php +++ b/codepot/src/codepot/views/code_file.php @@ -3,21 +3,21 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/common.css')?>" /> -<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/code.css')?>" /> -<script type="text/javascript" src="<?=base_url_make('/js/prettify/prettify.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-ada.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-basic.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-css.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lisp.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lua.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-pascal.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-sql.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-vb.js')?>"></script> +<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" /> +<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/code.css')?>" /> +<script type="text/javascript" src="<?php print base_url_make('/js/prettify/prettify.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/prettify/lang-ada.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/prettify/lang-basic.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/prettify/lang-css.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/prettify/lang-lisp.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/prettify/lang-lua.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/prettify/lang-pascal.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/prettify/lang-sql.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/prettify/lang-vb.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/jquery.min.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script> -<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" /> +<script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script> +<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/jquery-ui.css')?>" /> <script type="text/javascript"> $(function () { @@ -27,9 +27,9 @@ $(function () { ?> if ($("#code_file_mainarea_result_info").is(":visible")) - btn_label = "<?=$this->lang->line('Hide details')?>"; + btn_label = "<?php print $this->lang->line('Hide details')?>"; else - btn_label = "<?=$this->lang->line('Show details')?>"; + btn_label = "<?php print $this->lang->line('Show details')?>"; btn = $("#code_file_mainarea_details_button").button({"label": btn_label}).click (function () { @@ -38,13 +38,13 @@ $(function () { { $("#code_file_mainarea_result_info").hide("blind",{},200); $("#code_file_mainarea_details_button").button( - "option", "label", "<?=$this->lang->line('Show details')?>"); + "option", "label", "<?php print $this->lang->line('Show details')?>"); } else { $("#code_file_mainarea_result_info").show("blind",{},200); $("#code_file_mainarea_details_button").button( - "option", "label", "<?=$this->lang->line('Hide details')?>"); + "option", "label", "<?php print $this->lang->line('Hide details')?>"); } }); }); @@ -62,13 +62,13 @@ function showRawCode() if (showing_raw_code) { - $("#code_file_style_anchor").text("<?=$this->lang->line('Destyle')?>"); + $("#code_file_style_anchor").text("<?php print $this->lang->line('Destyle')?>"); $("#code_file_mainarea_result_pre").removeClass("prettyprinted"); prettyPrint(); } else { - $("#code_file_style_anchor").text("<?=$this->lang->line('Enstyle')?>"); + $("#code_file_style_anchor").text("<?php print $this->lang->line('Enstyle')?>"); $("#code_file_mainarea_result_pre").html($("#code_file_mainarea_result_raw").html()); } @@ -212,11 +212,11 @@ $this->load->view ( </div> <!-- code_file_mainarea_menu --> <div class="infostrip" id="code_file_mainarea_infostrip"> - <?=anchor ("code/file/{$project->id}/${xpar}/{$file['prev_rev']}", '<<')?> - <?=$this->lang->line('Revision')?>: <?=$file['created_rev']?> - <?=anchor ("code/file/{$project->id}/${xpar}/{$file['next_rev']}", '>>')?> | - <?=$this->lang->line('Size')?>: <?=$file['size']?> | - <a id="code_file_mainarea_details_button" href='#'><?=$this->lang->line('Details')?></a> + <?php print anchor ("code/file/{$project->id}/${xpar}/{$file['prev_rev']}", '<<')?> + <?php print $this->lang->line('Revision')?>: <?php print $file['created_rev']?> + <?php print anchor ("code/file/{$project->id}/${xpar}/{$file['next_rev']}", '>>')?> | + <?php print $this->lang->line('Size')?>: <?php print $file['size']?> | + <a id="code_file_mainarea_details_button" href='#'><?php print $this->lang->line('Details')?></a> </div> <div class="result" id="code_file_mainarea_result"> @@ -234,7 +234,7 @@ if ($login['settings'] != NULL && $login['settings']->code_hide_line_num == 'Y') $prettyprint_linenums = ''; ?> -<pre class="prettyprint <?=$prettyprint_linenums?> <?=$prettyprint_lang?>" id="code_file_mainarea_result_pre"> +<pre class="prettyprint <?php print $prettyprint_linenums?> <?php print $prettyprint_lang?>" id="code_file_mainarea_result_pre"> <?php $is_octet_stream = FALSE; if (array_key_exists('properties', $file) && count($file['properties']) > 0) @@ -267,12 +267,12 @@ if ($login['settings'] != NULL && </pre> <div id="code_file_mainarea_result_info"> -<div class="title"><?= $this->lang->line('CODE_COMMIT') ?></div> +<div class="title"><?php print $this->lang->line('CODE_COMMIT') ?></div> <?php printf ($this->lang->line('CODE_MSG_COMMITTED_BY_ON'), $file['last_author'], $file['time']); ?> -<div class="title"><?= $this->lang->line('Message') ?></div> +<div class="title"><?php print $this->lang->line('Message') ?></div> <pre id="code_file_mainarea_result_info_logmsg"> -<?= htmlspecialchars ($file['logmsg']) ?> +<?php print htmlspecialchars ($file['logmsg']) ?> </pre> <?php diff --git a/codepot/src/codepot/views/code_folder.php b/codepot/src/codepot/views/code_folder.php index 463f7822..b9aeaee5 100644 --- a/codepot/src/codepot/views/code_folder.php +++ b/codepot/src/codepot/views/code_folder.php @@ -5,28 +5,28 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/common.css')?>" /> -<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/code.css')?>" /> +<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" /> +<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/code.css')?>" /> -<script type="text/javascript" src="<?=base_url_make('/js/creole.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/creole.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/prettify/prettify.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-css.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lisp.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lua.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-sql.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-vb.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/prettify/prettify.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/prettify/lang-css.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/prettify/lang-lisp.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/prettify/lang-lua.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/prettify/lang-sql.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/prettify/lang-vb.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/jquery.min.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script> -<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" /> +<script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script> +<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/jquery-ui.css')?>" /> -<!--[if lte IE 8]><script type="text/javascript" src="<?=base_url_make('/js/excanvas.min.js')?>"></script><![endif]--> -<script type="text/javascript" src="<?=base_url_make('/js/jquery.flot.min.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/jquery.flot.time.min.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/jquery.flot.categories.min.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/jquery.flot.stack.min.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/jquery.flot.tickrotor.js')?>"></script> +<!--[if lte IE 8]><script type="text/javascript" src="<?php print base_url_make('/js/excanvas.min.js')?>"></script><![endif]--> +<script type="text/javascript" src="<?php print base_url_make('/js/jquery.flot.min.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/jquery.flot.time.min.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/jquery.flot.categories.min.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/jquery.flot.stack.min.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/jquery.flot.tickrotor.js')?>"></script> @@ -81,9 +81,9 @@ function show_loc_graph (response) var dataset = [ - { label: "<?=$this->lang->line('Code')?>", data: code }, - { label: "<?=$this->lang->line('Comment')?>", data: comment }, - { label: "<?=$this->lang->line('Blank')?>", data: blank } + { label: "<?php print $this->lang->line('Code')?>", data: code }, + { label: "<?php print $this->lang->line('Comment')?>", data: comment }, + { label: "<?php print $this->lang->line('Blank')?>", data: blank } ]; var options = { @@ -150,9 +150,9 @@ $(function () { ?> if ($("#code_folder_mainarea_result_info").is(":visible")) - btn_label = "<?=$this->lang->line('Hide details')?>"; + btn_label = "<?php print $this->lang->line('Hide details')?>"; else - btn_label = "<?=$this->lang->line('Show details')?>"; + btn_label = "<?php print $this->lang->line('Show details')?>"; btn = $("#code_folder_mainarea_details_button").button({"label": btn_label}).click (function () { @@ -160,13 +160,13 @@ $(function () { { $("#code_folder_mainarea_result_info").hide("blind",{},200); $("#code_folder_mainarea_details_button").button( - "option", "label", "<?=$this->lang->line('Show details')?>"); + "option", "label", "<?php print $this->lang->line('Show details')?>"); } else { $("#code_folder_mainarea_result_info").show("blind",{},200); $("#code_folder_mainarea_details_button").button( - "option", "label", "<?=$this->lang->line('Hide details')?>"); + "option", "label", "<?php print $this->lang->line('Hide details')?>"); } }); @@ -183,7 +183,7 @@ $(function () { //setTimeout (show_progress, 1000); var ajax_req = $.ajax ({ - url: '<?=site_url()?>/graph/folder_loc_json/<?=$project->id?>/<?=$this->converter->AsciiToHex($headpath)?><?=$revreq?>', + url: '<?php print site_url()?>/graph/folder_loc_json/<?php print $project->id?>/<?php print $this->converter->AsciiToHex($headpath)?><?php print $revreq?>', context: document.body, success: show_loc_graph }); @@ -202,8 +202,8 @@ function renderReadme() creole_render_wiki ( "code_folder_mainarea_result_readme_text", "code_folder_mainarea_result_readme", - "<?=site_url()?>/wiki/show/<?=$project->id?>/", - "<?=site_url()?>/wiki/attachment0/<?=$project->id?>/" + "<?php print site_url()?>/wiki/show/<?php print $project->id?>/", + "<?php print site_url()?>/wiki/attachment0/<?php print $project->id?>/" ); prettyPrint(); <?php endif; ?> @@ -284,21 +284,21 @@ $this->load->view ( <div class="infostrip" id="code_folder_mainarea_infostrip"> <?php if (CODEPOT_SIGNIN_FOR_CODE_SEARCH === FALSE || (isset($login['id']) && $login['id'] != '')): ?> - <?=form_open("code/search/{$project->id}/", 'id="code_folder_search_form"')?> - <?=form_hidden('search_folder', set_value('search_folder', $file['fullpath']), 'id="code_folder_search_folder"')?> - <?=form_hidden('search_revision', set_value('search_revision', $revision), 'id="code_folder_search_revision"')?> - <?=form_input('search_pattern', set_value('search_pattern', ''), 'id="code_folder_search_pattern"')?> - <?=form_submit('search_submit', $this->lang->line('Search'), 'id="code_folder_search_submit"')?> + <?php print form_open("code/search/{$project->id}/", 'id="code_folder_search_form"')?> + <?php print form_hidden('search_folder', set_value('search_folder', $file['fullpath']), 'id="code_folder_search_folder"')?> + <?php print form_hidden('search_revision', set_value('search_revision', $revision), 'id="code_folder_search_revision"')?> + <?php print form_input('search_pattern', set_value('search_pattern', ''), 'id="code_folder_search_pattern"')?> + <?php print form_submit('search_submit', $this->lang->line('Search'), 'id="code_folder_search_submit"')?> | <?php endif; ?> - <?=$this->lang->line('Revision')?>: <?=$file['created_rev']?> + <?php print $this->lang->line('Revision')?>: <?php print $file['created_rev']?> <?php if ($file_count > 0): ?> | - <a id="code_folder_mainarea_details_button" href='#'><?=$this->lang->line('Details')?></a> + <a id="code_folder_mainarea_details_button" href='#'><?php print $this->lang->line('Details')?></a> <?php endif; ?> - <?=form_close()?> + <?php print form_close()?> </div> <div class="result" id="code_folder_mainarea_result"> diff --git a/codepot/src/codepot/views/code_history.php b/codepot/src/codepot/views/code_history.php index d5bf7efe..25538cb0 100644 --- a/codepot/src/codepot/views/code_history.php +++ b/codepot/src/codepot/views/code_history.php @@ -3,8 +3,8 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/common.css')?>" /> -<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/code.css')?>" /> +<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" /> +<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/code.css')?>" /> <title><?php if ($fullpath == '') @@ -97,10 +97,10 @@ $this->load->view ( <table id="code_history_mainarea_result_table"> <tr class='heading'> - <th><?=$this->lang->line('Revision')?></th> - <th><?=$this->lang->line('Committer')?></th> - <th><?=$this->lang->line('Date')?></th> - <th><?=$this->lang->line('Message')?></th> + <th><?php print $this->lang->line('Revision')?></th> + <th><?php print $this->lang->line('Committer')?></th> + <th><?php print $this->lang->line('Date')?></th> + <th><?php print $this->lang->line('Message')?></th> <?php if ($file['type'] == 'file' || $file['type'] == 'dir') print '<th></th>'; ?> </tr> <?php diff --git a/codepot/src/codepot/views/code_revision.php b/codepot/src/codepot/views/code_revision.php index 8aef6d7d..d17810db 100644 --- a/codepot/src/codepot/views/code_revision.php +++ b/codepot/src/codepot/views/code_revision.php @@ -3,14 +3,14 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/common.css')?>" /> -<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/code.css')?>" /> +<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" /> +<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/code.css')?>" /> -<script type="text/javascript" src="<?=base_url_make('/js/creole.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/creole.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/jquery.min.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script> -<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" /> +<script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script> +<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/jquery-ui.css')?>" /> <script type="text/javascript"> @@ -22,18 +22,18 @@ $(function() { $("#code_revision_edit_div").dialog ( { - title: '<?=$this->lang->line('Edit')?>', + title: '<?php print $this->lang->line('Edit')?>', width: 'auto', height: 'auto', resizable: false, autoOpen: false, modal: true, buttons: { - '<?=$this->lang->line('OK')?>': function () { + '<?php print $this->lang->line('OK')?>': function () { $('#code_revision_edit_logmsg_form').submit (); $(this).dialog('close'); }, - '<?=$this->lang->line('Cancel')?>': function () { + '<?php print $this->lang->line('Cancel')?>': function () { $(this).dialog('close'); } }, @@ -54,18 +54,18 @@ $(function() { $(function() { $("#code_revision_new_review_comment_div").dialog ( { - title: '<?=$this->lang->line('Comment')?>', + title: '<?php print $this->lang->line('Comment')?>', width: 'auto', height: 'auto', resizable: false, autoOpen: false, modal: true, buttons: { - '<?=$this->lang->line('OK')?>': function () { + '<?php print $this->lang->line('OK')?>': function () { $('#code_revision_new_review_comment_form').submit (); $(this).dialog('close'); }, - '<?=$this->lang->line('Cancel')?>': function () { + '<?php print $this->lang->line('Cancel')?>': function () { $(this).dialog('close'); } }, @@ -130,13 +130,13 @@ $(function() { <?php if (strlen($popup_error_message) > 0): ?> $(function() { $("#code_revision_popup_error_div").dialog( { - title: '<?=$this->lang->line('Error')?>', + title: '<?php print $this->lang->line('Error')?>', width: 'auto', height: 'auto', modal: true, autoOpen: true, buttons: { - "<?=$this->lang->line('OK')?>": function() { + "<?php print $this->lang->line('OK')?>": function() { $( this ).dialog( "close" ); } } @@ -153,7 +153,7 @@ function render_wiki() creole_render_wiki ( "code_revision_mainarea_result_msg_text", "code_revision_mainarea_result_msg", - "<?=site_url()?>/wiki/show/<?=$project->id?>/", + "<?php print site_url()?>/wiki/show/<?php print $project->id?>/", "" ); @@ -164,7 +164,7 @@ function render_wiki() creole_render_wiki ( "code_revision_mainarea_review_comment_text_" + (i + 1) , "code_revision_mainarea_review_comment_" + (i + 1), - "<?=site_url()?>/wiki/show/<?=$project->id?>/", + "<?php print site_url()?>/wiki/show/<?php print $project->id?>/", "" ); @@ -281,20 +281,20 @@ $history = $file['history']; </div> <!-- code_revision_mainarea_menu --> <div class="infostrip" id="code_revision_mainarea_infostrip"> - <?=anchor ("code/revision/{$project->id}/${xpar}/{$prev_revision}", '<<')?> - <?=$this->lang->line('Revision')?>: <?=$history['rev']?> - <?=anchor ("code/revision/{$project->id}/${xpar}/{$next_revision}", '>>')?> | - <?=$this->lang->line('Committer')?>: <?=htmlspecialchars($history['author'])?> | - <?=$this->lang->line('Last updated on')?>: <?=date('r', strtotime($history['date']))?> + <?php print anchor ("code/revision/{$project->id}/${xpar}/{$prev_revision}", '<<')?> + <?php print $this->lang->line('Revision')?>: <?php print $history['rev']?> + <?php print anchor ("code/revision/{$project->id}/${xpar}/{$next_revision}", '>>')?> | + <?php print $this->lang->line('Committer')?>: <?php print htmlspecialchars($history['author'])?> | + <?php print $this->lang->line('Last updated on')?>: <?php print date('r', strtotime($history['date']))?> </div> <div class="result" id="code_revision_mainarea_result"> -<div class="title"><?=$this->lang->line('Message')?>  +<div class="title"><?php print $this->lang->line('Message')?>  <?php if ($can_edit): ?> <span class='anchor'> - <?=anchor ("#", $this->lang->line('Edit'), + <?php print anchor ("#", $this->lang->line('Edit'), array ('id' => 'code_revision_edit_logmsg_button')); ?> </span> @@ -307,7 +307,7 @@ $history = $file['history']; </pre> </div> -<div class="title"><?=$this->lang->line('Files')?></div> +<div class="title"><?php print $this->lang->line('Files')?></div> <table id="code_revision_mainarea_result_table"> <?php /* @@ -347,10 +347,10 @@ $history = $file['history']; -<div class="title"><?=$this->lang->line('Comment')?>  +<div class="title"><?php print $this->lang->line('Comment')?>  <?php if ($is_loggedin): ?> <span class='anchor'> - <?=anchor ("#", $this->lang->line('New'), + <?php print anchor ("#", $this->lang->line('New'), array ('id' => 'code_revision_new_review_comment_button')); ?> </span> @@ -408,8 +408,8 @@ $history = $file['history']; <?php if ($can_edit): ?> <div id="code_revision_edit_div"> - <?=form_open("code/revision/{$project->id}${revreqroot}", 'id="code_revision_edit_logmsg_form"')?> - <?= + <?php print form_open("code/revision/{$project->id}${revreqroot}", 'id="code_revision_edit_logmsg_form"')?> + <?php print form_textarea ( array ('name' => 'edit_log_message', 'value' => $history['msg'], 'rows'=> 10, 'cols' => 70, @@ -417,7 +417,7 @@ $history = $file['history']; ) ?> - <?=form_close()?> + <?php print form_close()?> </div> <?php endif; ?> <!-- $can_edit --> @@ -462,7 +462,7 @@ $history = $file['history']; <?php if (strlen($popup_error_message) > 0): ?> <div id="code_revision_popup_error_div"> -<?=$popup_error_message?> +<?php print $popup_error_message?> </div> <?php endif; ?> diff --git a/codepot/src/codepot/views/code_search.php b/codepot/src/codepot/views/code_search.php index 7a2e41c1..bcc6e179 100644 --- a/codepot/src/codepot/views/code_search.php +++ b/codepot/src/codepot/views/code_search.php @@ -5,12 +5,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/common.css')?>" /> -<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/code.css')?>" /> +<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" /> +<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/code.css')?>" /> -<script type="text/javascript" src="<?=base_url_make('/js/jquery.min.js')?>"></script> -<script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script> -<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" /> +<script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script> +<script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script> +<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/jquery-ui.css')?>" /> <?php $file_count = count($file['content']); @@ -98,14 +98,14 @@ $this->load->view ( <div class="infostrip" id="code_search_mainarea_infostrip"> - <?=form_open("code/search/{$project->id}/", 'id="code_search_search_form"')?> - <?=form_hidden ('search_folder', set_value('search_folder', $file['fullpath']), 'id="code_search_search_folder"')?> - <?=form_hidden ('search_revision', set_value('search_revision', $revision), 'id="code_search_search_revision"')?> - <?=form_input ('search_pattern', set_value('search_pattern', ''), 'id="code_search_search_pattern"')?> - <?=form_submit ('search_submit', $this->lang->line('Search'), 'id="code_search_search_submit"')?> + <?php print form_open("code/search/{$project->id}/", 'id="code_search_search_form"')?> + <?php print form_hidden ('search_folder', set_value('search_folder', $file['fullpath']), 'id="code_search_search_folder"')?> + <?php print form_hidden ('search_revision', set_value('search_revision', $revision), 'id="code_search_search_revision"')?> + <?php print form_input ('search_pattern', set_value('search_pattern', ''), 'id="code_search_search_pattern"')?> + <?php print form_submit ('search_submit', $this->lang->line('Search'), 'id="code_search_search_submit"')?> | - <?=$this->lang->line('Revision')?>: <?=$file['created_rev']?> - <?=form_close()?> + <?php print $this->lang->line('Revision')?>: <?php print $file['created_rev']?> + <?php print form_close()?> </div> <div id="code_search_mainarea_result"> diff --git a/codepot/src/codepot/views/error.php b/codepot/src/codepot/views/error.php index 3a8799ca..961b6848 100644 --- a/codepot/src/codepot/views/error.php +++ b/codepot/src/codepot/views/error.php @@ -4,9 +4,9 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/common.css')?>" /> -<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/project.css')?>" /> -<title><?=$title?> + + +<?php print $title?> @@ -44,9 +44,9 @@ $this->load->view (
- +
- +
load->view ('footer'); ?> diff --git a/codepot/src/codepot/views/file_delete.php b/codepot/src/codepot/views/file_delete.php index 2a9d428a..0dd605e1 100644 --- a/codepot/src/codepot/views/file_delete.php +++ b/codepot/src/codepot/views/file_delete.php @@ -3,10 +3,10 @@ - - + + -<title><?=htmlspecialchars($file->name)?> +<title><?php print htmlspecialchars($file->name)?> @@ -43,26 +43,26 @@ $this->load->view ( '.htmlspecialchars($message).''; ?>
-id}/".$this->converter->AsciiToHex($file->name))?> +id}/".$this->converter->AsciiToHex($file->name))?>
- - lang->line('MSG_SURE_TO_DELETE_THIS') ?> - name)?> - + + lang->line('MSG_SURE_TO_DELETE_THIS') ?> - name)?> +
- projectid))?> - name))?> + projectid))?> + name))?>
- lang->line('Delete'))?> + lang->line('Delete'))?>
- +
diff --git a/codepot/src/codepot/views/file_edit.php b/codepot/src/codepot/views/file_edit.php index dc3f32b0..4881db35 100644 --- a/codepot/src/codepot/views/file_edit.php +++ b/codepot/src/codepot/views/file_edit.php @@ -3,21 +3,21 @@ - - + + - + - - - - - - + + + + + + - - - + + + -<?=htmlspecialchars($file->name)?> +<?php print htmlspecialchars($file->name)?> @@ -80,10 +80,10 @@ $this->load->view ( '.htmlspecialchars($message).''; ?>
-id}/" . $this->converter->AsciiToHex($file->name))?> +id}/" . $this->converter->AsciiToHex($file->name))?>
- lang->line('Name').': ', 'file_name')?> + lang->line('Name').': ', 'file_name')?> load->view ( else print form_upload('file_name', set_value('file_name', $file->name), $extra); ?> - +
- lang->line('Tag').': ', 'file_tag')?> + lang->line('Tag').': ', 'file_tag')?> - tag), $extra)?> - + tag), $extra)?> +
- lang->line('Summary').': ', 'file_summary')?> - + lang->line('Summary').': ', 'file_summary')?> +
- summary), $extra)?> + summary), $extra)?>
- lang->line('Description').': ', 'file_description')?> - lang->line('Preview')?> - + lang->line('Description').': ', 'file_description')?> + lang->line('Preview')?> +
- description), 'id=file_edit_mainarea_description')?> + description), 'id=file_edit_mainarea_description')?>
- projectid))?> + projectid))?> lang->line('Update'): $this->lang->line('Create'); ?> - + - +
diff --git a/codepot/src/codepot/views/file_home.php b/codepot/src/codepot/views/file_home.php index f2b2e563..e0379057 100644 --- a/codepot/src/codepot/views/file_home.php +++ b/codepot/src/codepot/views/file_home.php @@ -5,10 +5,10 @@ - - + + -<?=htmlspecialchars($project->name)?> +<?php print htmlspecialchars($project->name)?> @@ -43,7 +43,7 @@ $this->load->view (
-
lang->line('Files')?>
+
lang->line('Files')?>
- - + + - + - - - - - - + + + + + + - - - + + + -<?=htmlspecialchars($project->name)?> - <?=htmlspecialchars($file->name)?> +<?php print htmlspecialchars($project->name)?> - <?php print htmlspecialchars($file->name)?> @@ -96,11 +96,11 @@ $this->load->view (
-
name)?>
+
name)?>
- id}/". $this->converter->AsciiToHex($file->name), $this->lang->line('Download')) ?> - | lang->line('Details')?> + id}/". $this->converter->AsciiToHex($file->name), $this->lang->line('Download')) ?> + | lang->line('Details')?>
@@ -117,15 +117,15 @@ $this->load->view (
    -
  • lang->line('Created on')?> createdon ?>
    • -
  • lang->line('Created by')?> createdby ?>
    • -
  • lang->line('Last updated on')?> updatedon ?>
    • -
  • lang->line('Last updated by')?> updatedby ?>
    • +
  • lang->line('Created on')?> createdon ?>
    • +
  • lang->line('Created by')?> createdby ?>
    • +
  • lang->line('Last updated on')?> updatedon ?>
    • +
  • lang->line('Last updated by')?> updatedby ?>
-
lang->line('MD5')?>
+
lang->line('MD5')?>
    -
  • md5sum ?>
    • +
  • md5sum ?>
diff --git a/codepot/src/codepot/views/footer.php b/codepot/src/codepot/views/footer.php index 02077655..152fb394 100644 --- a/codepot/src/codepot/views/footer.php +++ b/codepot/src/codepot/views/footer.php @@ -1,9 +1,9 @@
- Codepot by Hyung-Hwan Chung + Codepot by Hyung-Hwan Chung - +
diff --git a/codepot/src/codepot/views/graph_main.php b/codepot/src/codepot/views/graph_main.php index df400f53..951e1129 100644 --- a/codepot/src/codepot/views/graph_main.php +++ b/codepot/src/codepot/views/graph_main.php @@ -4,29 +4,29 @@ - - + + - - + + - + - - - - - - + + + + + + - - - - - - - - + + + + + + + + -<?=htmlspecialchars($project->name)?> +<?php print htmlspecialchars($project->name)?> @@ -457,10 +457,10 @@ $this->load->view ( --> @@ -471,7 +471,7 @@ $this->load->view (
-name)?> +name)?>
diff --git a/codepot/src/codepot/views/issue_delete.php b/codepot/src/codepot/views/issue_delete.php index 4c0da436..1a5eef5a 100644 --- a/codepot/src/codepot/views/issue_delete.php +++ b/codepot/src/codepot/views/issue_delete.php @@ -3,10 +3,10 @@ - - + + -<title><?=htmlspecialchars($issue->id)?> +<title><?php print htmlspecialchars($issue->id)?> @@ -43,26 +43,26 @@ $this->load->view ( '.htmlspecialchars($message).'
'; ?>
-id}/".$this->converter->AsciiToHex($issue->id))?> +id}/".$this->converter->AsciiToHex($issue->id))?>
- - lang->line('MSG_SURE_TO_DELETE_THIS')?> - id)?> - + + lang->line('MSG_SURE_TO_DELETE_THIS')?> - id)?> +
- projectid))?> - id))?> + projectid))?> + id))?>
- lang->line('Delete'))?> + lang->line('Delete'))?>
- +
diff --git a/codepot/src/codepot/views/issue_edit.php b/codepot/src/codepot/views/issue_edit.php index cbd4328a..e618cefa 100644 --- a/codepot/src/codepot/views/issue_edit.php +++ b/codepot/src/codepot/views/issue_edit.php @@ -3,21 +3,21 @@ - - + + - + - - - - - - + + + + + + - - - + + + -<?=htmlspecialchars($issue->id)?> +<?php print htmlspecialchars($issue->id)?> @@ -87,13 +87,13 @@ $this->load->view ( ?>
-id}/".$this->converter->AsciiToHex($issue->id))?> +id}/".$this->converter->AsciiToHex($issue->id))?>
- id))?> - projectid))?> - status))?> - priority))?> - owner))?> + id))?> + projectid))?> + status))?> + priority))?> + owner))?>
@@ -116,20 +116,20 @@ $this->load->view (
- lang->line('Summary').': ', 'issue_summary')?> - + lang->line('Summary').': ', 'issue_summary')?> +
- summary), 'size="80" id="issue_edit_mainarea_summary"') ?>
- lang->line('Description').': ', 'issue_description')?> - lang->line('Preview')?> - + lang->line('Description').': ', 'issue_description')?> + lang->line('Preview')?> +
load->view ( lang->line('Update'): $this->lang->line('Create'); ?> - + - +
diff --git a/codepot/src/codepot/views/issue_home.php b/codepot/src/codepot/views/issue_home.php index c890d53c..578ab236 100644 --- a/codepot/src/codepot/views/issue_home.php +++ b/codepot/src/codepot/views/issue_home.php @@ -5,12 +5,12 @@ - - + + - - - + + + -<?=htmlspecialchars($project->name)?> +<?php print htmlspecialchars($project->name)?> @@ -92,11 +92,11 @@ $this->load->view (
-
lang->line('Issues')?>
+
lang->line('Issues')?>
lang->line('ISSUE_MSG_TOTAL_NUM_ISSUES'), $total_num_issues); ?> | -lang->line('Search')?> +lang->line('Search')?>
@@ -107,24 +107,24 @@ $this->load->view ( ?>
- lang->line('Type'), 'issue_search_type') + lang->line('Type'), 'issue_search_type') ?> - type), 'id="issue_search_type"') ?> - lang->line('Status'), 'issue_search_status') + lang->line('Status'), 'issue_search_status') ?> - status), 'id="issue_search_status"') ?> - lang->line('Priority'), 'issue_search_priority') + lang->line('Priority'), 'issue_search_priority') ?> - priority), 'id="issue_search_priority"') @@ -133,18 +133,18 @@ $this->load->view (
- lang->line('Owner'), 'issue_search_owner') + lang->line('Owner'), 'issue_search_owner') ?> - owner), 'id="issue_search_owner"') ?>
- lang->line('Summary'), 'issue_search_summary') + lang->line('Summary'), 'issue_search_summary') ?> - summary), 'id="issue_search_summary" size="50"') ?> diff --git a/codepot/src/codepot/views/issue_show.php b/codepot/src/codepot/views/issue_show.php index 6ea004b9..f2ea7f19 100644 --- a/codepot/src/codepot/views/issue_show.php +++ b/codepot/src/codepot/views/issue_show.php @@ -2,21 +2,21 @@ - - + + - + - - - - - - + + + + + + - - - + + + -<?=htmlspecialchars($project->name)?> - <?=$this->lang->line('Issue')?> <?=htmlspecialchars($issue->id)?> +<?php print htmlspecialchars($project->name)?> - <?php print $this->lang->line('Issue')?> <?php print htmlspecialchars($issue->id)?> @@ -197,8 +197,8 @@ $this->load->view (
- lang->line('Issue')?> id)?>: - summary)?> + lang->line('Issue')?> id)?>: + summary)?>
@@ -234,7 +234,7 @@ $this->load->view ( print ' | '; } ?> - lang->line('Change')?> + lang->line('Change')?>
@@ -369,34 +369,34 @@ $this->load->view (
- id}/{$hexid}/", 'id="issue_change_form"')?> + id}/{$hexid}/", 'id="issue_change_form"')?>
- lang->line('Type'), + lang->line('Type'), 'issue_change_type') ?> - type), 'id="issue_change_type"') ?> - lang->line('Status'), + lang->line('Status'), 'issue_change_status') ?> - status), 'id="issue_change_status"') ?> - lang->line('Priority'), + lang->line('Priority'), 'issue_change_priority') ?> - priority), @@ -405,7 +405,7 @@ $this->load->view (
- lang->line('Owner'), + lang->line('Owner'), 'issue_change_owner') ?> @@ -420,7 +420,7 @@ $this->load->view ( if ($found === FALSE) $owner_array[$issue->owner] = $issue->owner; ?> - owner), @@ -429,8 +429,8 @@ $this->load->view (
- lang->line('Comment'), 'issue_change_comment')?> - lang->line('Preview')?> + lang->line('Comment'), 'issue_change_comment')?> + lang->line('Preview')?> 'issue_change_comment', @@ -444,12 +444,12 @@ $this->load->view (
- +
- lang->line ('ISSUE_MSG_CONFIRM_UNDO')?> + lang->line ('ISSUE_MSG_CONFIRM_UNDO')?>
@@ -473,8 +473,8 @@ function render_wiki() creole_render_wiki ( "issue_show_mainarea_description_pre", "issue_show_mainarea_description", - "", - "" + "", + "" ); ", - "" + "", + "" ); prettyPrint (); diff --git a/codepot/src/codepot/views/log.php b/codepot/src/codepot/views/log.php index df20661e..1f2e1ade 100644 --- a/codepot/src/codepot/views/log.php +++ b/codepot/src/codepot/views/log.php @@ -3,14 +3,14 @@ - - + + - - - + + + - - + + + -<?=$this->lang->line('Projects')?> +<?php print $this->lang->line('Projects')?> @@ -93,33 +93,33 @@ $this->load->view (
lang->line('PROJECT_MSG_TOTAL_NUM_PROJECTS'), $total_num_projects); ?> | -lang->line('Search')?> +lang->line('Search')?>
- lang->line('ID'), 'id') + lang->line('ID'), 'id') ?> - id), 'id="project_search_id"') ?>
- lang->line('Name'), 'name') + lang->line('Name'), 'name') ?> - name), 'id="project_search_name"') ?>
- lang->line('Summary'), 'summary') + lang->line('Summary'), 'summary') ?> - summary), 'id="project_search_summary" size="50"') ?> @@ -129,7 +129,7 @@ $this->load->view (
-
+
- + - - + + -<?=htmlspecialchars($project->name)?> +<?php print htmlspecialchars($project->name)?> @@ -42,26 +42,26 @@ $this->load->view ( $message
"; ?>
-id)?> +id)?>
- - lang->line('MSG_SURE_TO_DELETE_THIS')?> - name)?> - + + lang->line('MSG_SURE_TO_DELETE_THIS')?> - name)?> +
- id))?> - name))?> + id))?> + name))?>
- lang->line('Delete'))?> + lang->line('Delete'))?>
- +
diff --git a/codepot/src/codepot/views/project_edit.php b/codepot/src/codepot/views/project_edit.php index b39906b6..afbd98a7 100644 --- a/codepot/src/codepot/views/project_edit.php +++ b/codepot/src/codepot/views/project_edit.php @@ -3,21 +3,21 @@ - - + + - + - - - - - - + + + + + + - - - + + + -<?=$project->name?> +<?php print $project->name?> @@ -82,39 +82,39 @@ $this->load->view ( ?>
- +
- lang->line('ID').': ', 'project_id')?> + lang->line('ID').': ', 'project_id')?> - id), $extra)?> - + id), $extra)?> +
- lang->line('Name').': ', 'project_name')?> - + lang->line('Name').': ', 'project_name')?> +
- name), $extra)?> + name), $extra)?>
- lang->line('Summary').': ', 'project_summary')?> - + lang->line('Summary').': ', 'project_summary')?> +
- summary), $extra)?> + summary), $extra)?>
- lang->line('Description').': ', 'project_description')?> - lang->line('Preview')?> - + lang->line('Description').': ', 'project_description')?> + lang->line('Preview')?> +
load->view (
- lang->line('Commitable').': ', 'project_commitable')?> - commitable, $project->commitable == 'Y'))?> - + lang->line('Commitable').': ', 'project_commitable')?> + commitable, $project->commitable == 'Y'))?> + - lang->line('Public').': ', 'project_public')?> - public, $project->public == 'Y'))?> - + lang->line('Public').': ', 'project_public')?> + public, $project->public == 'Y'))?> +
- lang->line('Members').': ', 'project_members')?> - + lang->line('Members').': ', 'project_members')?> +
load->view (
lang->line('Update'): $this->lang->line('Create'); ?> - + - +
diff --git a/codepot/src/codepot/views/project_home.php b/codepot/src/codepot/views/project_home.php index 1201bd5d..3346cc4b 100644 --- a/codepot/src/codepot/views/project_home.php +++ b/codepot/src/codepot/views/project_home.php @@ -4,23 +4,23 @@ - - + + - - + + - + - - - - - - + + + + + + - - + + -<?=htmlspecialchars($project->name)?> +<?php print htmlspecialchars($project->name)?> @@ -74,15 +74,15 @@ $this->load->view (
    -
  • lang->line('Created on')?> createdon?>
    • -
  • lang->line('Created by')?> createdby?>
    • -
  • lang->line('Last updated on')?> updatedon?>
    • -
  • lang->line('Last updated by')?> updatedby?>
    • +
  • lang->line('Created on')?> createdon?>
    • +
  • lang->line('Created by')?> createdby?>
    • +
  • lang->line('Last updated on')?> updatedon?>
    • +
  • lang->line('Last updated by')?> updatedby?>
-
lang->line('Members')?>
+
lang->line('Members')?>
    members; @@ -127,7 +127,7 @@ $this->load->view (
-
lang->line('Repository')?>
+
lang->line('Repository')?>
    -id}", $this->lang->line('Change log')) ?> +id}", $this->lang->line('Change log')) ?>
    0) @@ -271,7 +271,7 @@ foreach ($urls as $url)
    -name)?> +name)?>
    diff --git a/codepot/src/codepot/views/site_catalog.php b/codepot/src/codepot/views/site_catalog.php index 3ebeb779..4c354647 100644 --- a/codepot/src/codepot/views/site_catalog.php +++ b/codepot/src/codepot/views/site_catalog.php @@ -3,10 +3,10 @@ - - + + -<?=htmlspecialchars($this->lang->line('Administration'))?> +<?php print htmlspecialchars($this->lang->line('Administration'))?> diff --git a/codepot/src/codepot/views/site_delete.php b/codepot/src/codepot/views/site_delete.php index 24f1384e..1d0cc1dc 100644 --- a/codepot/src/codepot/views/site_delete.php +++ b/codepot/src/codepot/views/site_delete.php @@ -3,10 +3,10 @@ - - + + -<?=htmlspecialchars($site->name)?> +<?php print htmlspecialchars($site->name)?> @@ -41,26 +41,26 @@ $this->load->view ( $message
    "; ?>
    -id}")?> +id}")?>
    - - lang->line('MSG_SURE_TO_DELETE_THIS')?> - name)?> (id?>) - + + lang->line('MSG_SURE_TO_DELETE_THIS')?> - name)?> (id?>) +
    - id))?> - name))?> + id))?> + name))?>
    - lang->line('Delete'))?> + lang->line('Delete'))?>
    - +
    diff --git a/codepot/src/codepot/views/site_edit.php b/codepot/src/codepot/views/site_edit.php index 5449da51..b95e9495 100644 --- a/codepot/src/codepot/views/site_edit.php +++ b/codepot/src/codepot/views/site_edit.php @@ -3,22 +3,22 @@ - - + + - + - - - - - - + + + + + + - - - + + + -<?=htmlspecialchars($site->name)?> +<?php print htmlspecialchars($site->name)?> @@ -84,37 +84,37 @@ $this->load->view ( ?>
    - +
    - lang->line('Language').': ', 'site_id')?> + lang->line('Language').': ', 'site_id')?> - id), $extra) ?> - +
    - lang->line('Name').': ', 'site_name')?> - lang->line('Name').': ', 'site_name')?> + name), 'maxlength="80" size="40" class="name"'); ?> - +
    - lang->line('Text').': ', 'site_text')?> - lang->line('Preview')?> - + lang->line('Text').': ', 'site_text')?> + lang->line('Preview')?> +
    - text), 'class="text" id="site_edit_mainarea_text"') ?> @@ -123,8 +123,8 @@ $this->load->view ( lang->line('Update'): $this->lang->line('Create'); ?> - - + +
    diff --git a/codepot/src/codepot/views/site_home.php b/codepot/src/codepot/views/site_home.php index 60daa641..a134aecb 100644 --- a/codepot/src/codepot/views/site_home.php +++ b/codepot/src/codepot/views/site_home.php @@ -5,14 +5,14 @@ - - + + - + - - - + + + @@ -69,7 +69,7 @@ $this->load->view (