diff --git a/codepot/Makefile.am b/codepot/Makefile.am index 3d94c4e9..a7017379 100644 --- a/codepot/Makefile.am +++ b/codepot/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTION = foreign SUBDIRS = etc src sbin pecl-svn -EXTRA_DIST = README mkmf.sh DEBIAN +EXTRA_DIST = README.md mkmf.sh DEBIAN PHP_PACKAGE_NAME ?= php diff --git a/codepot/Makefile.in b/codepot/Makefile.in index 0ede6a44..de6fc830 100644 --- a/codepot/Makefile.in +++ b/codepot/Makefile.in @@ -308,7 +308,7 @@ wwwdir = @wwwdir@ ACLOCAL_AMFLAGS = -I ac/m4 AUTOMAKE_OPTION = foreign SUBDIRS = etc src sbin pecl-svn -EXTRA_DIST = README mkmf.sh DEBIAN +EXTRA_DIST = README.md mkmf.sh DEBIAN all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/codepot/configure b/codepot/configure index 9a1ea101..e716e784 100755 --- a/codepot/configure +++ b/codepot/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for codepot 0.3.0. +# Generated by GNU Autoconf 2.69 for codepot 0.4.0. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -576,8 +576,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='codepot' PACKAGE_TARNAME='codepot' -PACKAGE_VERSION='0.3.0' -PACKAGE_STRING='codepot 0.3.0' +PACKAGE_VERSION='0.4.0' +PACKAGE_STRING='codepot 0.4.0' PACKAGE_BUGREPORT='' PACKAGE_URL='http://code.abiyo.net/@codepot' @@ -1243,7 +1243,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.3.0 to adapt to many kinds of systems. +\`configure' configures codepot 0.4.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1310,7 +1310,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of codepot 0.3.0:";; + short | recursive ) echo "Configuration of codepot 0.4.0:";; esac cat <<\_ACEOF @@ -1397,7 +1397,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -codepot configure 0.3.0 +codepot configure 0.4.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1414,7 +1414,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.3.0, which was +It was created by codepot $as_me 0.4.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2281,7 +2281,7 @@ fi # Define the identity of the package. PACKAGE='codepot' - VERSION='0.3.0' + VERSION='0.4.0' cat >>confdefs.h <<_ACEOF @@ -3392,7 +3392,7 @@ phpextinidir=$phpextinidir -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/fonts/Makefile src/css/images/Makefile src/css/Makefile src/js/prettify/Makefile src/js/Makefile src/ace/Makefile src/system/fonts/Makefile src/system/libraries/javascript/Makefile src/system/libraries/Cache/drivers/Makefile src/system/libraries/Cache/Makefile src/system/libraries/Makefile src/system/language/english/Makefile src/system/language/Makefile src/system/helpers/Makefile src/system/core/Makefile src/system/database/drivers/odbc/Makefile src/system/database/drivers/pdo/Makefile src/system/database/drivers/postgre/Makefile src/system/database/drivers/mssql/Makefile src/system/database/drivers/cubrid/Makefile src/system/database/drivers/mysql/Makefile src/system/database/drivers/sqlsrv/Makefile src/system/database/drivers/oci8/Makefile src/system/database/drivers/sqlite/Makefile src/system/database/drivers/mysqli/Makefile src/system/database/drivers/Makefile src/system/database/Makefile src/system/Makefile src/Makefile" +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/core/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/fonts/Makefile src/css/images/Makefile src/css/Makefile src/js/prettify/Makefile src/js/Makefile src/ace/Makefile src/system/fonts/Makefile src/system/libraries/javascript/Makefile src/system/libraries/Cache/drivers/Makefile src/system/libraries/Cache/Makefile src/system/libraries/Makefile src/system/language/english/Makefile src/system/language/Makefile src/system/helpers/Makefile src/system/core/Makefile src/system/database/drivers/odbc/Makefile src/system/database/drivers/pdo/Makefile src/system/database/drivers/postgre/Makefile src/system/database/drivers/mssql/Makefile src/system/database/drivers/cubrid/Makefile src/system/database/drivers/mysql/Makefile src/system/database/drivers/sqlsrv/Makefile src/system/database/drivers/oci8/Makefile src/system/database/drivers/sqlite/Makefile src/system/database/drivers/mysqli/Makefile src/system/database/drivers/Makefile src/system/database/Makefile src/system/Makefile src/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -3909,7 +3909,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.3.0, which was +This file was extended by codepot $as_me 0.4.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3972,7 +3972,7 @@ _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.3.0 +codepot config.status 0.4.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -4118,6 +4118,7 @@ do "src/config.php") CONFIG_FILES="$CONFIG_FILES src/config.php" ;; "src/codepot/config/Makefile") CONFIG_FILES="$CONFIG_FILES src/codepot/config/Makefile" ;; "src/codepot/controllers/Makefile") CONFIG_FILES="$CONFIG_FILES src/codepot/controllers/Makefile" ;; + "src/codepot/core/Makefile") CONFIG_FILES="$CONFIG_FILES src/codepot/core/Makefile" ;; "src/codepot/errors/Makefile") CONFIG_FILES="$CONFIG_FILES src/codepot/errors/Makefile" ;; "src/codepot/helpers/Makefile") CONFIG_FILES="$CONFIG_FILES src/codepot/helpers/Makefile" ;; "src/codepot/hooks/Makefile") CONFIG_FILES="$CONFIG_FILES src/codepot/hooks/Makefile" ;; diff --git a/codepot/configure.ac b/codepot/configure.ac index b03b971c..c7cb60b7 100644 --- a/codepot/configure.ac +++ b/codepot/configure.ac @@ -1,7 +1,7 @@ dnl AC_PREREQ(2.59) -AC_INIT([codepot],[0.3.0],,,[http://code.abiyo.net/@codepot]) +AC_INIT([codepot],[0.4.0],,,[http://code.abiyo.net/@codepot]) AC_CONFIG_HEADER([./config.h]) AC_CONFIG_AUX_DIR([ac/aux]) AC_CONFIG_MACRO_DIR([ac/m4]) @@ -121,6 +121,7 @@ AC_CONFIG_FILES([ src/config.php src/codepot/config/Makefile src/codepot/controllers/Makefile + src/codepot/core/Makefile src/codepot/errors/Makefile src/codepot/helpers/Makefile src/codepot/hooks/Makefile diff --git a/codepot/src/codepot/Makefile.am b/codepot/src/codepot/Makefile.am index e34d11fb..1821532a 100644 --- a/codepot/src/codepot/Makefile.am +++ b/codepot/src/codepot/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = config controllers errors helpers hooks language libraries models views +SUBDIRS = config controllers core errors helpers hooks language libraries models views wwwdir=$(WWWDIR)/codepot www_DATA = \ diff --git a/codepot/src/codepot/Makefile.in b/codepot/src/codepot/Makefile.in index 49a8c1c3..57307681 100644 --- a/codepot/src/codepot/Makefile.in +++ b/codepot/src/codepot/Makefile.in @@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ wwwdir = $(WWWDIR)/codepot -SUBDIRS = config controllers errors helpers hooks language libraries models views +SUBDIRS = config controllers core errors helpers hooks language libraries models views www_DATA = \ index.html diff --git a/codepot/src/codepot/controllers/graph.php b/codepot/src/codepot/controllers/graph.php index 82240d72..dccc4ab6 100644 --- a/codepot/src/codepot/controllers/graph.php +++ b/codepot/src/codepot/controllers/graph.php @@ -39,11 +39,11 @@ class Graph extends CI_Controller redirect (CODEPOT_SIGNIN_REDIR_PATH . $this->converter->AsciiTohex(current_url())); $data['login'] = $login; - //$path = $this->converter->HexToAscii ($path); + //$path = $this->converter->HexToAscii($path); //if ($path == '.') $path = ''; /* treat a period specially */ //$path = $this->_normalize_path ($path); - $project = $this->projects->get ($projectid); + $project = $this->projects->get($projectid); if ($project === FALSE) { $data['message'] = 'DATABASE ERROR'; @@ -80,7 +80,7 @@ class Graph extends CI_Controller return; } - $project = $this->projects->get ($projectid); + $project = $this->projects->get($projectid); if ($project === FALSE || ($project->public !== 'Y' && $login['id'] == '')) { header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found'); @@ -89,7 +89,7 @@ class Graph extends CI_Controller $this->load->model ('SubversionModel', 'subversion'); - $path = $this->converter->HexToAscii ($path); + $path = $this->converter->HexToAscii($path); if ($path == '.') $path = ''; /* treat a period specially */ $path = $this->_normalize_path ($path); @@ -109,7 +109,7 @@ class Graph extends CI_Controller } } - print codepot_json_encode ($history); + print codepot_json_encode($history); } function enjson_loc_by_lang ($projectid = '', $path = '', $rev = SVN_REVISION_HEAD) @@ -123,7 +123,7 @@ class Graph extends CI_Controller return; } - $project = $this->projects->get ($projectid); + $project = $this->projects->get($projectid); if ($project === FALSE || ($project->public !== 'Y' && $login['id'] == '')) { header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found'); @@ -132,12 +132,12 @@ class Graph extends CI_Controller $this->load->model ('SubversionModel', 'subversion'); - $path = $this->converter->HexToAscii ($path); + $path = $this->converter->HexToAscii($path); if ($path == '.') $path = ''; /* treat a period specially */ $path = $this->_normalize_path ($path); - $cloc = $this->subversion->clocRevByLang ($projectid, $path, $rev); - print codepot_json_encode ($cloc); + $cloc = $this->subversion->clocRevByLang($projectid, $path, $rev); + print codepot_json_encode($cloc); } function enjson_loc_by_file ($projectid = '', $path = '', $rev = SVN_REVISION_HEAD) @@ -151,7 +151,7 @@ class Graph extends CI_Controller return; } - $project = $this->projects->get ($projectid); + $project = $this->projects->get($projectid); if ($project === FALSE || ($project->public !== 'Y' && $login['id'] == '')) { header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found'); @@ -160,12 +160,12 @@ class Graph extends CI_Controller $this->load->model ('SubversionModel', 'subversion'); - $path = $this->converter->HexToAscii ($path); + $path = $this->converter->HexToAscii($path); if ($path == '.') $path = ''; /* treat a period specially */ $path = $this->_normalize_path ($path); - $cloc = $cloc = $this->subversion->clocRevByFile ($projectid, $path, $rev); - print codepot_json_encode ($cloc); + $cloc = $cloc = $this->subversion->clocRevByFile($projectid, $path, $rev); + print codepot_json_encode($cloc); } function enjson_revision_graph ($projectid = '', $path = '', $rev = SVN_REVISION_HEAD) @@ -179,7 +179,7 @@ class Graph extends CI_Controller return; } - $project = $this->projects->get ($projectid); + $project = $this->projects->get($projectid); if ($project === FALSE || ($project->public !== 'Y' && $login['id'] == '')) { header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found'); @@ -188,12 +188,12 @@ class Graph extends CI_Controller $this->load->model ('SubversionModel', 'subversion'); - $path = $this->converter->HexToAscii ($path); + $path = $this->converter->HexToAscii($path); if ($path == '.') $path = ''; /* treat a period specially */ $path = $this->_normalize_path ($path); - $rg = $this->subversion->revisionGraph ($projectid, $path, $rev); - print codepot_json_encode ($rg); + $rg = $this->subversion->revisionGraph($projectid, $path, $rev); + print codepot_json_encode($rg); } function enjson_project_members ($filter = '') @@ -207,7 +207,7 @@ class Graph extends CI_Controller return; } - $filter = $this->converter->HexToAscii ($filter); + $filter = $this->converter->HexToAscii($filter); $rel = $this->projects->getProjectMembers($filter); print codepot_json_encode($rel); } diff --git a/codepot/src/codepot/controllers/user.php b/codepot/src/codepot/controllers/user.php index 3070ddff..13ebb46c 100644 --- a/codepot/src/codepot/controllers/user.php +++ b/codepot/src/codepot/controllers/user.php @@ -188,7 +188,7 @@ class User extends CI_Controller $user->id = $login['id']; $user->xid = $this->converter->AsciiToHex($user->id); $user->summary = ''; - $settings = $this->users->fetchSettings ($user->id); + $settings = $this->users->fetchSettings($user->id); if ($settings !== FALSE && $settings !== NULL) $user->summary = $settings->user_summary; $icon_fname = FALSE; @@ -239,6 +239,7 @@ class User extends CI_Controller // also change the sanity check in LoginModel/getUser() // if you add/delete fields to the settings object. // + $settings = new stdClass(); $settings->code_hide_line_num = $this->input->post('code_hide_line_num'); $settings->code_hide_metadata = $this->input->post('code_hide_metadata'); $settings->user_summary = $this->input->post('user_summary'); diff --git a/codepot/src/codepot/core/MY_URI.php b/codepot/src/codepot/core/MY_URI.php new file mode 100644 index 00000000..c9c2acc7 --- /dev/null +++ b/codepot/src/codepot/core/MY_URI.php @@ -0,0 +1,19 @@ +_set_routing() + // Router::_set_routing() -> URI::_explode_segments -> URI::__filter_uri + // + // Create MY_URI and implement _filter_uri here to override the default behavior + // + + function _filter_uri ($uri) + { + return rawurldecode(parent::_filter_uri($uri)); + } +} + diff --git a/codepot/src/codepot/core/Makefile.am b/codepot/src/codepot/core/Makefile.am new file mode 100644 index 00000000..a2711068 --- /dev/null +++ b/codepot/src/codepot/core/Makefile.am @@ -0,0 +1,6 @@ +wwwdir=$(WWWDIR)/codepot/core +www_DATA = \ + MY_URI.php + +EXTRA_DIST = $(www_DATA) + diff --git a/codepot/src/codepot/core/Makefile.in b/codepot/src/codepot/core/Makefile.in new file mode 100644 index 00000000..8f6c8aeb --- /dev/null +++ b/codepot/src/codepot/core/Makefile.in @@ -0,0 +1,473 @@ +# Makefile.in generated by automake 1.16.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2018 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__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +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 = src/codepot/core +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) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/./config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +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 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(wwwdir)" +DATA = $(www_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +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@ +runstatedir = @runstatedir@ +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)/codepot/core +www_DATA = \ + MY_URI.php + +EXTRA_DIST = $(www_DATA) +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 src/codepot/core/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/codepot/core/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__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + 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): +install-wwwDATA: $(www_DATA) + @$(NORMAL_INSTALL) + @list='$(www_DATA)'; test -n "$(wwwdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(wwwdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(wwwdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(wwwdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(wwwdir)" || exit $$?; \ + done + +uninstall-wwwDATA: + @$(NORMAL_UNINSTALL) + @list='$(www_DATA)'; test -n "$(wwwdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(wwwdir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(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 $(DATA) +installdirs: + for dir in "$(DESTDIR)$(wwwdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +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 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: install-wwwDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +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: uninstall-wwwDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip install-wwwDATA \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags-am uninstall uninstall-am \ + uninstall-wwwDATA + +.PRECIOUS: Makefile + + +# 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/src/gen-makefile-am-in-system.php b/codepot/src/gen-makefile-am-in-system.php index 0eaca4a6..7824bb10 100644 --- a/codepot/src/gen-makefile-am-in-system.php +++ b/codepot/src/gen-makefile-am-in-system.php @@ -1,5 +1,8 @@ CI->lang->load('form_validation'); + + // HYUNG-HWAN: codepot doesn't ship the other language files for form validation + // let's hard-code it to english + //$this->CI->lang->load('form_validation'); + $this->CI->lang->load('form_validation', 'english'); + // Cycle through the rules for each field, match the // corresponding $_POST item and test for errors