added the user settings view with minimal numbers of options

2010-05-18 14:12:52 +00:00 · 2010-05-18 14:12:52 +00:00 · b3033def53
commit b3033def53
parent 42bf53b773
69 changed files with 538 additions and 118 deletions
--- a/codepot/DEBIAN/Makefile.in
+++ b/codepot/DEBIAN/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/Makefile.in
+++ b/codepot/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -265,7 +265,7 @@ codepot.spec: $(top_builddir)/config.status $(srcdir)/codepot.spec.in
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@ -290,7 +290,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"

 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@ -454,7 +454,8 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@ -498,17 +499,17 @@ dist dist-all: distdir
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
--- a/codepot/aclocal.m4
+++ b/codepot/aclocal.m4
@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-

 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
@ -13,8 +13,8 @@

 m4_ifndef([AC_AUTOCONF_VERSION],
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-[m4_warning([this file was generated for autoconf 2.64.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.11.1], [],
      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])

@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
--- a/codepot/configure
+++ b/codepot/configure
@ -1,12 +1,14 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for codepot 0.1.0.
+# Generated by GNU Autoconf 2.65 for codepot 0.1.0.
 #
 # Report bugs to <Hyung-Hwan Chung <hyunghwan.chung@gmail.com>>.
 #
+#
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+#
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
@ -526,7 +528,8 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"


-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1

 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@ -1338,7 +1341,7 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
 codepot configure 0.1.0
-generated by GNU Autoconf 2.64
+generated by GNU Autoconf 2.65

 Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@ -1355,7 +1358,7 @@ 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.0, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was

  $ $0 $@

@ -1608,7 +1611,7 @@ fi
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
  test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
    sed 's/^/| /' "$ac_site_file" >&5
@ -1617,9 +1620,9 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
 done

 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
    case $cache_file in
@ -2042,6 +2045,7 @@ IFS=$as_save_IFS

 fi

+  test -d ./--version && rmdir ./--version
  if test "${ac_cv_path_mkdir+set}" = set; then
    MKDIR_P="$ac_cv_path_mkdir -p"
  else
@ -2049,7 +2053,6 @@ fi
    # value for MKDIR_P within a source directory, because that will
    # break other packages using the cache if that directory is
    # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
    MKDIR_P="$ac_install_sh -d"
  fi
 fi
@ -3629,7 +3632,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by codepot $as_me 0.1.0, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
  CONFIG_HEADERS  = $CONFIG_HEADERS
@ -3668,6 +3671,7 @@ Usage: $0 [OPTION]... [TAG]...

  -h, --help       print this help, then exit
  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
  -q, --quiet, --silent
                   do not print progress messages
  -d, --debug      don't remove temporary files
@ -3688,10 +3692,11 @@ codepot home page: <http://www.abiyo.net/codepot>."

 _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.0
-configured by $0, generated by GNU Autoconf 2.64,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
+  with options \\"\$ac_cs_config\\"

 Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
@ -3729,6 +3734,8 @@ do
    ac_cs_recheck=: ;;
  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
  --debug | --debu | --deb | --de | --d | -d )
    debug=: ;;
  --file | --fil | --fi | --f )
@ -3959,7 +3966,7 @@ s/'"$ac_delim"'$//
 t delim
 :nl
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@ -3973,7 +3980,7 @@ s/.\{148\}//
 t nl
 :delim
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
--- a/codepot/etc/Makefile.in
+++ b/codepot/etc/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/etc/codepot.sql
+++ b/codepot/etc/codepot.sql
@ -146,3 +146,9 @@ CREATE TABLE log  (
 	createdon  DATETIME     NOT NULL,
 	INDEX timed_project_type_action (createdon, projectid, type, action)
 ) charset=utf8 engine=InnoDB;	
+
+CREATE TABLE user_settings (
+	userid              VARCHAR(32) PRIMARY KEY,
+	code_hide_line_num CHAR(1) NOT NULL,
+	code_hide_details  CHAR(1) NOT NULL
+) charset=utf8 engine=InnoDB;
--- a/codepot/src/Makefile.in
+++ b/codepot/src/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -275,7 +275,7 @@ uninstall-wwwDATA:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@ -300,7 +300,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"

 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
--- a/codepot/src/codepot/Makefile.in
+++ b/codepot/src/codepot/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -271,7 +271,7 @@ uninstall-wwwDATA:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@ -296,7 +296,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"

 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
--- a/codepot/src/codepot/config/Makefile.in
+++ b/codepot/src/codepot/config/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/codepot/controllers/Makefile.in
+++ b/codepot/src/codepot/controllers/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/codepot/controllers/main.php
+++ b/codepot/src/codepot/controllers/main.php
@ -22,6 +22,7 @@ class Main extends Controller

 	function signin ($xurl = '')
 	{
+		$this->load->model ('UserModel', 'users');
 		$this->load->library(array('encrypt', 'form_validation', 'session'));

 		$this->form_validation->set_rules('user_name', 'username', 'required|alpha_dash');
@ -48,6 +49,10 @@ class Main extends Controller
 				}
 				else
 				{
+					$settings = $this->users->fetchSettings ($user_name);
+					if ($settings !== FALSE)
+						$this->login->setUserSettings ($settings);
+
 					if ($user_url != '') redirect ($user_url);
 					else redirect ('site/home');
 				}
--- a/codepot/src/codepot/controllers/user.php
+++ b/codepot/src/codepot/controllers/user.php
@ -5,6 +5,7 @@ class User extends Controller
 	var $VIEW_ERROR = 'error';
 	var $VIEW_LOG = 'log';
        var $VIEW_HOME = 'user_home';
+        var $VIEW_SETTINGS = 'user_settings';

 	function User ()
 	{
@ -17,6 +18,7 @@ class User extends Controller

 		$this->load->library ('Language', 'lang');
 		$this->lang->load ('common', CODEPOT_LANG);
+		$this->lang->load ('user', CODEPOT_LANG);
 	}

 	function index ()
@ -136,6 +138,59 @@ class User extends Controller
 			$this->load->view ($this->VIEW_LOG, $data);
 		}
 	}
+
+	function settings ()
+	{
+		$this->load->model ('UserModel', 'users');
+		$this->load->library(array('encrypt', 'form_validation', 'session'));
+
+		$login = $this->login->getUser ();
+		if (CODEPOT_SIGNIN_COMPULSORY && $login['id'] == '')
+			redirect ('main/signin');
+
+		if ($login['id'] == '')
+		{
+			redirect ('site/home');
+			return;
+		}
+
+		$data['login'] = $login;
+		$data['message'] = '';
+
+		if($this->input->post('settings'))
+		{
+                        $settings->code_hide_line_num = $this->input->post('code_hide_line_num');
+                        $settings->code_hide_details = $this->input->post('code_hide_details');
+
+			if ($this->users->storeSettings ($login['id'], $settings) === FALSE)
+			{
+				$data['message'] = 'DATABASE ERROR';
+				$data['settings'] = $settings;
+				$this->load->view ($this->VIEW_SETTINGS, $data);
+			}
+			else
+			{
+				$this->login->setUserSettings ($settings);
+
+				$data['message'] = 'SETTINGS STORED SUCCESSFULLY';
+				$data['settings'] = $settings;
+				$this->load->view ($this->VIEW_SETTINGS, $data);
+			}
+		}
+		else
+		{
+			$settings = $this->users->fetchSettings ($login['id']);
+			if ($settings === FALSE || $settings === NULL)
+			{
+				if ($settings === FALSE) $data['message'] = 'DATABASE ERROR';
+				$settings->code_hide_line_num = ' ';
+				$settings->code_hide_details = ' ';
+			}
+
+			$data['settings'] = $settings;
+			$this->load->view ($this->VIEW_SETTINGS, $data);
+		}
+	}
 }

 ?>
--- a/codepot/src/codepot/errors/Makefile.in
+++ b/codepot/src/codepot/errors/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/codepot/helpers/Makefile.in
+++ b/codepot/src/codepot/helpers/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/codepot/hooks/Makefile.in
+++ b/codepot/src/codepot/hooks/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/codepot/language/Makefile.in
+++ b/codepot/src/codepot/language/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -223,7 +223,7 @@ $(am__aclocal_m4_deps):
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@ -248,7 +248,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"

 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
--- a/codepot/src/codepot/language/english/Makefile.am
+++ b/codepot/src/codepot/language/english/Makefile.am
@ -7,6 +7,7 @@ www_DATA =  \
 	index.html \
 	project_lang.php \
 	site_lang.php \
+	user_lang.php \
 	wiki_lang.php

 EXTRA_DIST = $(www_DATA)
--- a/codepot/src/codepot/language/english/Makefile.in
+++ b/codepot/src/codepot/language/english/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -173,6 +173,7 @@ www_DATA = \
 	index.html \
 	project_lang.php \
 	site_lang.php \
+	user_lang.php \
 	wiki_lang.php

 EXTRA_DIST = $(www_DATA)
--- a/codepot/src/codepot/language/english/common_lang.php
+++ b/codepot/src/codepot/language/english/common_lang.php
@ -63,6 +63,7 @@ $lang['Purge'] = 'Purge';
 $lang['Repository'] = 'Repository';
 $lang['Revision'] = 'Revision';
 $lang['Search'] = 'Search';
+$lang['Settings'] = 'Settings';
 $lang['Show details'] = 'Show details';
 $lang['Sign in'] = 'Sign in';
 $lang['Sign out'] = 'Sign out';
--- a/codepot/src/codepot/language/english/user_lang.php
+++ b/codepot/src/codepot/language/english/user_lang.php
@ -0,0 +1,4 @@
+<?php
+$lang['USER_MSG_HIDE_DETAILS'] = 'Hide details';
+$lang['USER_MSG_HIDE_LINE_NUMBER'] = 'Hide line numbers';
+?>
--- a/codepot/src/codepot/language/indonesian/Makefile.in
+++ b/codepot/src/codepot/language/indonesian/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/codepot/language/korean/Makefile.am
+++ b/codepot/src/codepot/language/korean/Makefile.am
@ -7,6 +7,7 @@ www_DATA =  \
 	index.html \
 	project_lang.php \
 	site_lang.php \
+	user_lang.php \
 	wiki_lang.php

 EXTRA_DIST = $(www_DATA)
--- a/codepot/src/codepot/language/korean/Makefile.in
+++ b/codepot/src/codepot/language/korean/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -173,6 +173,7 @@ www_DATA = \
 	index.html \
 	project_lang.php \
 	site_lang.php \
+	user_lang.php \
 	wiki_lang.php

 EXTRA_DIST = $(www_DATA)
--- a/codepot/src/codepot/language/korean/common_lang.php
+++ b/codepot/src/codepot/language/korean/common_lang.php
@ -63,6 +63,7 @@ $lang['Purge'] = '정화하기';
 $lang['Repository'] = '저장소';
 $lang['Revision'] = '리비전';
 $lang['Search'] = '찾기';
+$lang['Settings'] = '설정';
 $lang['Show details'] = '상세내역보기';
 $lang['Sign in'] = '로그인';
 $lang['Sign out'] = '로그아웃';
--- a/codepot/src/codepot/language/korean/user_lang.php
+++ b/codepot/src/codepot/language/korean/user_lang.php
@ -0,0 +1,4 @@
+<?php
+$lang['USER_MSG_HIDE_DETAILS'] = '상세내역을 보고 싶지 않아요';
+$lang['USER_MSG_HIDE_LINE_NUMBER'] = '라인번호를 보고 싶지 않아요'; 
+?>
--- a/codepot/src/codepot/libraries/Makefile.in
+++ b/codepot/src/codepot/libraries/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/codepot/models/Makefile.am
+++ b/codepot/src/codepot/models/Makefile.am
@ -10,6 +10,7 @@ www_DATA =  \
 	projectmodel.php \
 	sitemodel.php \
 	subversionmodel.php \
+	usermodel.php \
 	wikimodel.php

 EXTRA_DIST = $(www_DATA)
--- a/codepot/src/codepot/models/Makefile.in
+++ b/codepot/src/codepot/models/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -176,6 +176,7 @@ www_DATA = \
 	projectmodel.php \
 	sitemodel.php \
 	subversionmodel.php \
+	usermodel.php \
 	wikimodel.php

 EXTRA_DIST = $(www_DATA)
--- a/codepot/src/codepot/models/loginmodel.php
+++ b/codepot/src/codepot/models/loginmodel.php
@ -24,6 +24,7 @@ class LoginModel extends Model
 			$userid = '';
 			$email = '';
 			$issysadmin = FALSE;
+			$settings = NULL;
 		}
 		else
 		{
@ -35,12 +36,16 @@ class LoginModel extends Model

 			$issysadmin = $this->session->userdata('sysadmin?');
 			if ($issysadmin === NULL) $issysadmin = FALSE;
+
+			$settings = $this->session->userdata('user_settings');
+			if ($settings !== NULL) $settings = unserialize ($settings);
 		}

 		return array (
 			'id' => $userid, 
 			'email' => $email,
-			'sysadmin?' => $issysadmin
+			'sysadmin?' => $issysadmin,
+			'settings' => $settings
 		);
 	}

@ -78,6 +83,11 @@ class LoginModel extends Model
 		$this->session->sess_destroy ();
 	}

+	function setUserSettings ($settings)
+	{
+		$this->session->set_userdata ('user_settings', serialize($settings));
+	}
+
 	function getErrorMessage ()
 	{
 		return $this->error_message;
--- a/codepot/src/codepot/models/usermodel.php
+++ b/codepot/src/codepot/models/usermodel.php
@ -0,0 +1,109 @@
+<?php
+
+class UserModel extends Model
+{
+	function UserModel ()
+	{
+		parent::Model ();
+		$this->load->database ();
+	}
+
+	function fetchSettings ($userid)
+	{
+		$this->db->trans_start ();
+		$this->db->where ('userid', $userid);
+		$query = $this->db->get ('user_settings');
+		if ($this->db->trans_status() === FALSE)
+		{
+			$this->db->trans_complete ();
+			return FALSE;
+		}
+
+		$result = $query->result ();
+		if (empty($result))
+		{
+			$this->db->trans_complete ();
+			if ($this->db->trans_status() === FALSE) return FALSE;
+			return NULL;
+		}
+
+		$this->db->trans_complete ();
+		if ($this->db->trans_status() === FALSE) return FALSE;
+
+		return $result[0];
+	}
+
+	function storeSettings ($userid, $settings)
+	{
+		$this->db->trans_begin ();
+
+		$this->db->where ('userid', $userid);
+		$query = $this->db->get ('user_settings');
+
+		if ($this->db->trans_status() === FALSE)
+		{
+			$this->db->trans_complete ();
+			return FALSE;
+		}
+
+		$result = $query->result ();
+		if (empty($result))
+		{
+			$this->db->set ('userid', $userid);
+			$this->db->set ('code_hide_line_num', (string)$settings->code_hide_line_num);
+			$this->db->set ('code_hide_details', (string)$settings->code_hide_details);
+			$this->db->insert ('user_settings');
+		}
+		else
+		{
+			$this->db->where ('userid', $userid);
+			$this->db->set ('code_hide_line_num', (string)$settings->code_hide_line_num);
+			$this->db->set ('code_hide_details', (string)$settings->code_hide_details);
+			$this->db->update ('user_settings');
+		}
+
+		if ($this->db->trans_status() === FALSE)
+		{
+			$this->db->trans_rollback ();
+			return FALSE;
+		}
+
+		$this->db->trans_commit ();
+		return TRUE;
+
+		/* affected_rows() does not seem to work reliably ...
+		$this->db->trans_begin ();
+
+		$this->db->where ('userid', $userid);
+		$this->db->set ('code_hide_line_num', (string)$settings->code_hide_line_num);
+		$this->db->set ('code_hide_details', (string)$settings->code_hide_details);
+		$this->db->update ('user_settings');
+
+		if ($this->db->trans_status() === FALSE)
+		{
+			$this->db->trans_rollback ();
+			return FALSE;
+		}
+
+		if ($this->db->affected_rows () <= 0)
+		{
+			$this->db->set ('userid', $userid);
+			$this->db->set ('code_hide_line_num', (string)$settings->code_hide_line_num);
+			$this->db->set ('code_hide_details', (string)$settings->code_hide_details);
+			$this->db->insert ('user_settings');
+
+			if ($this->db->trans_status() === FALSE)
+			{
+				$this->db->trans_rollback ();
+				return FALSE;
+			}
+		}
+
+		$this->db->trans_commit ();
+		return TRUE;
+		*/
+	}
+
+}
+
+?>
--- a/codepot/src/codepot/views/Makefile.am
+++ b/codepot/src/codepot/views/Makefile.am
@ -31,6 +31,7 @@ www_DATA =  \
 	site_show.php \
 	taskbar.php \
 	user_home.php \
+	user_settings.php \
 	wiki_delete.php \
 	wiki_edit.php \
 	wiki_home.php \
--- a/codepot/src/codepot/views/Makefile.in
+++ b/codepot/src/codepot/views/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -197,6 +197,7 @@ www_DATA = \
 	site_show.php \
 	taskbar.php \
 	user_home.php \
+	user_settings.php \
 	wiki_delete.php \
 	wiki_edit.php \
 	wiki_home.php \
--- a/codepot/src/codepot/views/code_blame.php
+++ b/codepot/src/codepot/views/code_blame.php
@ -17,6 +17,11 @@

 <script type="text/javascript">
 $(function () {
+	<?php
+	if ($login['settings'] != NULL && $login['settings']->code_hide_details == 'Y')
+		print '$("#code_blame_mainarea_result_info").hide();';
+	?>
+
 	if ($("#code_blame_mainarea_result_info").is(":visible"))
 		btn_label = "<?=$this->lang->line('Hide details')?>";
 	else
@ -195,7 +200,16 @@ print anchor ("code/history/{$project->id}/{$xpar}", $this->lang->line('History'
 	
 		print "<span class='nocode'>{$rev_padded}</span>";
 		print "<span class='nocode' title='{$author}'>{$author_padded}</span>";
+
+		if ($login['settings'] != NULL && $login['settings']->code_hide_line_num == 'Y')
+		{
+			/* do nothing */
+		}
+		else
+		{
 			print "<span class='nocode'>{$lineno_padded}</span>";
+		}
+
 		print htmlspecialchars ($line['line']);
 		print "\n";
 	}
--- a/codepot/src/codepot/views/code_file.php
+++ b/codepot/src/codepot/views/code_file.php
@ -17,11 +17,17 @@

 <script type="text/javascript">
 $(function () {
+	<?php
+	if ($login['settings'] != NULL && $login['settings']->code_hide_details == 'Y')
+		print '$("#code_file_mainarea_result_info").hide();';
+	?>
+
 	if ($("#code_file_mainarea_result_info").is(":visible"))
 		btn_label = "<?=$this->lang->line('Hide details')?>";
 	else
 		btn_label = "<?=$this->lang->line('Show details')?>";
 	
+
 	btn = $("#code_file_mainarea_details_button").button({"label": btn_label}).click (function () {
 		
 		if ($("#code_file_mainarea_result_info").is(":visible"))
@ -156,8 +162,12 @@ if ($fileext == '') $fileext = "html"

 <pre class="prettyprint lang-<?=$fileext?>" id="code_file_mainarea_result_pre">
 <?php
-	// print htmlspecialchars($file['content']);
-
+	if ($login['settings'] != NULL && $login['settings']->code_hide_line_num == 'Y')
+	{
+		print htmlspecialchars($file['content']);
+	}
+	else
+	{
 		$pos = 0; $lineno = 0; $len = strlen($file['content']);
 		while ($pos < $len)
 		{
@ -177,6 +187,7 @@ if ($fileext == '') $fileext = "html"

 			$pos = $npos + 1;
 		}
+	}
 ?>
 </pre>

--- a/codepot/src/codepot/views/code_folder.php
+++ b/codepot/src/codepot/views/code_folder.php
@ -16,6 +16,11 @@
 <script type="text/javascript">
 <?php if ($file_count > 0): ?>
 $(function () {
+	<?php
+	if ($login['settings'] != NULL && $login['settings']->code_hide_details == 'Y')
+		print '$("#code_folder_mainarea_result_info").hide();';
+	?>
+
 	if ($("#code_folder_mainarea_result_info").is(":visible"))
 		btn_label = "<?=$this->lang->line('Hide details')?>";
 	else
--- a/codepot/src/codepot/views/projectbar.php
+++ b/codepot/src/codepot/views/projectbar.php
@ -90,7 +90,8 @@ function show_projectbar ($con, $banner, $page, $ctxmenuitems)
 	{
 		$menuitems = array (
 			array ("user/home", $con->lang->line('Overview')),
-			array ("user/log", $con->lang->line('Log'))
+			array ("user/log", $con->lang->line('Log')),
+			array ("user/settings", $con->lang->line('Settings'))
 		);

 		foreach ($menuitems as $item)
--- a/codepot/src/codepot/views/site_home.php
+++ b/codepot/src/codepot/views/site_home.php
@ -5,7 +5,13 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css">
 <link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/site.css">
+
+<script type="text/javascript" src="<?=base_url()?>/js/jquery.min.js"></script>
+<script type="text/javascript" src="<?=base_url()?>/js/jquery-ui.min.js"></script>
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/jquery-ui.css" />
+
 <script type="text/javascript" src="<?=base_url()?>/js/creole.js"></script>
+
 <script type="text/javascript">
 function render_wiki()
 {
--- a/codepot/src/codepot/views/taskbar.php
+++ b/codepot/src/codepot/views/taskbar.php
@ -17,17 +17,20 @@ function show_taskbar ($con, $login)
 	}
 	else
 	{
+
+//print '<div id="taskbar_signin_panel">';
+
 		print form_open('main/signin');

+//print '<div id="taskbar_signin_form_panel">';
+
 		$user_name = "";
 		$user_pass = "";

-		//$hex = $con->converter->AsciiToHex (current_url());
 		print form_hidden (
 			'user_url', 
 			set_value ('user_url', current_url())
 		);
-		//print anchor ("main/signin/{$hex}", $con->lang->line('Sign in'));

 		print form_label(
 			$con->lang->line('Username'), 
@ -41,7 +44,6 @@ function show_taskbar ($con, $login)
 		);

 		print '&nbsp;';
-
 		print form_label (
 			$con->lang->line('Password'),
 			'taskbar_user_pass'
@ -57,12 +59,22 @@ function show_taskbar ($con, $login)
 		print form_submit (
 			'login', 
 			$con->lang->line('Sign in'), 
-			'class="button"'
+			'class="button" id="taskbar_signin_ok_button"'
 		);
+//print '</div>';
+
+//print '<div id="taskbar_signin_button_panel">';
+//		print '<a href="#" id="taskbar_signin_button">';
+//		print $con->lang->line('Sign in');
+//		print '</a>';
+//print '</div>';

 		print form_close();
+
+//print '</div>';
+
 	}
-	print '</div>';
+	print '</div>'; // boxb

 	print '<div class="boxa">';
 	print anchor ('site/home', $con->lang->line('Home'));
@ -73,7 +85,30 @@ function show_taskbar ($con, $login)

 	print '</div>';
 }
+?>

+<script type="text/javascript">
+/*
+$(function () {
+	$("#taskbar_signin_form_panel").hide();
+
+	btn_label = "<?=$this->lang->line('Sign in')?>";
+	btn = $("#taskbar_signin_button").button({"label": btn_label}).click (function () {
+		if ($("#taskbar_signin_form_panel").is(":visible"))
+		{
+			$("#taskbar_signin_form_panel").hide("slide",{direction: 'right'},200);
+		}
+		else
+		{
+			$("#taskbar_signin_form_panel").show("slide",{direction: 'right'},200);
+		}
+	});
+
+	$("#taskbar_signin_ok_button").button();
+}); */
+</script> 
+
+<?php
 show_taskbar ($this, $login);
 ?>

--- a/codepot/src/codepot/views/user_settings.php
+++ b/codepot/src/codepot/views/user_settings.php
@ -0,0 +1,105 @@
+<html>
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css" />
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/user.css" />
+
+<!--
+<script type="text/javascript" src="<?=base_url()?>/js/jquery.min.js"></script>
+<script type="text/javascript" src="<?=base_url()?>/js/jquery-ui.min.js"></script>
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/jquery-ui.css" />
+-->
+
+<script type="text/javascript">
+$(function () {
+	$('#user_settings_mainarea_result').accordion();
+});
+</script>
+
+<title><?=htmlspecialchars($login['id'])?></title>
+</head>
+
+<body>
+
+<div class="content" id="user_settings_content">
+
+<!---------------------------------------------------------------------------->
+
+<?php $this->load->view ('taskbar'); ?>
+
+<!---------------------------------------------------------------------------->
+
+<?php
+$user->id = $login['id'];
+
+$this->load->view (
+        'projectbar',
+        array (
+		'banner' => NULL,
+
+		'page' => array (
+			'type' => 'user',
+			'id' => 'issues',
+			'user' => $user,
+		),
+
+                'ctxmenuitems' => array ()
+        )
+);
+?>
+
+<!---------------------------------------------------------------------------->
+
+<div class="mainarea" id="user_settings_mainarea">
+
+<?php
+	if ($message != '') 
+		print "<div id='user_settings_mainarea_message' class='form_message'>$message</div>";
+?>
+
+<div id="user_settings_mainarea_result">
+
+<?=form_open('user/settings/')?>
+
+	<?=form_fieldset($this->lang->line('Code'))?>
+
+		<?=form_checkbox('code_hide_line_num', 
+			'Y', $settings->code_hide_line_num == 'Y')
+		?>
+		<?= $this->lang->line('USER_MSG_HIDE_LINE_NUMBER')?>
+
+		<?=form_checkbox('code_hide_details',
+			'Y', $settings->code_hide_details == 'Y')
+		?>
+		<?= $this->lang->line('USER_MSG_HIDE_DETAILS')?>
+	
+	<?=form_fieldset_close()?>
+
+	<!--
+	<?=form_fieldset($this->lang->line('Issue'))?>
+	<?=form_fieldset_close()?>
+	-->
+
+	<div class="buttons">
+		<?=form_submit('settings', $this->lang->line('OK'))?>
+	</div>
+
+<?=form_close();?>
+
+
+</div> <!-- user_settings_mainarea_result -->
+
+</div> <!-- user_settings_mainarea -->
+
+<!---------------------------------------------------------------------------->
+
+<?php $this->load->view ('footer'); ?>
+
+<!---------------------------------------------------------------------------->
+
+
+</div> <!-- user_settings_content -->
+
+</body>
+</html>
--- a/codepot/src/config.php.in
+++ b/codepot/src/config.php.in
@ -8,8 +8,16 @@ define ('CODEPOT_LOG_DIR',   '@LOGDIR@/'); // this requires a trailing slash
 define ('CODEPOT_CACHE_DIR', '@CACHEDIR@');

 function load_ini ($file)
+{
+	if (defined('INI_SCANNER_RAW'))
+	{
+		$cfg = @parse_ini_file ($file, FALSE, INI_SCANNER_RAW);
+	}
+	else
 	{
 		$cfg = @parse_ini_file ($file, FALSE);
+	}
+
 	if (!is_array($cfg)) $cfg = array ();

 	$xcfgs = array (
--- a/codepot/src/css/Makefile.in
+++ b/codepot/src/css/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -281,7 +281,7 @@ uninstall-wwwDATA:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@ -306,7 +306,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"

 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
--- a/codepot/src/css/common.css
+++ b/codepot/src/css/common.css
@ -464,3 +464,27 @@ pre.prettyprint .nocode a:hover {
 	color: #bb2322;
 	font-style: italic;
 }
+
+/* === signin panel === */
+#taskbar_signin_panel {
+	position: absolute;
+	right: 0.8em;
+	top: 0.8em;
+}
+#taskbar_signin_form_panel {
+	background-color: black;
+	padding: 0.6em 0.6em 0.6em 0.6em;
+	float: right;
+	-moz-border-radius-bottomleft:2px;
+	-moz-border-radius-bottomright:2px;
+	-moz-border-radius-topleft:2px;
+	-moz-border-radius-topright:2px;
+	white-space: nowrap;
+}
+#taskbar_signin_button_panel {
+	float: right;
+	margin-left: 0.3em;
+}
+#taskbar_signin_button_panel a {
+	color: #0073EA;
+}
--- a/codepot/src/css/images/Makefile.in
+++ b/codepot/src/css/images/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/css/jquery-ui.css
+++ b/codepot/src/css/jquery-ui.css
@ -57,8 +57,8 @@
 /* Interaction states
 ----------------------------------*/
 .ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #dddddd; background: #f6f6f6 url(images/ui-bg_highlight-soft_100_f6f6f6_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #0073ea; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #0073ea; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #0073ea; background: #0073ea url(images/ui-bg_highlight-soft_25_0073ea_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #ffffff; }
+ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #0073ea; text-decoration: none; }
+/*.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #0073ea; background: #0073ea url(images/ui-bg_highlight-soft_25_0073ea_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #ffffff; }*/
 .ui-state-hover a, .ui-state-hover a:hover { color: #ffffff; text-decoration: none; }
 .ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #dddddd; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; }
 .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #eb8f00; text-decoration: none; }
--- a/codepot/src/js/Makefile.in
+++ b/codepot/src/js/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -273,7 +273,7 @@ uninstall-wwwDATA:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@ -298,7 +298,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"

 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
--- a/codepot/src/js/prettify/Makefile.in
+++ b/codepot/src/js/prettify/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/system/Makefile.in
+++ b/codepot/src/system/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -271,7 +271,7 @@ uninstall-wwwDATA:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@ -296,7 +296,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"

 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
--- a/codepot/src/system/cache/Makefile.in
+++ b/codepot/src/system/cache/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/system/codeigniter/Makefile.in
+++ b/codepot/src/system/codeigniter/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/system/database/Makefile.in
+++ b/codepot/src/system/database/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -278,7 +278,7 @@ uninstall-wwwDATA:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@ -303,7 +303,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"

 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
--- a/codepot/src/system/database/drivers/Makefile.in
+++ b/codepot/src/system/database/drivers/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -271,7 +271,7 @@ uninstall-wwwDATA:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@ -296,7 +296,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"

 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
--- a/codepot/src/system/database/drivers/mssql/Makefile.in
+++ b/codepot/src/system/database/drivers/mssql/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/system/database/drivers/mysql/Makefile.in
+++ b/codepot/src/system/database/drivers/mysql/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/system/database/drivers/mysqli/Makefile.in
+++ b/codepot/src/system/database/drivers/mysqli/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/system/database/drivers/oci8/Makefile.in
+++ b/codepot/src/system/database/drivers/oci8/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/system/database/drivers/odbc/Makefile.in
+++ b/codepot/src/system/database/drivers/odbc/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/system/database/drivers/postgre/Makefile.in
+++ b/codepot/src/system/database/drivers/postgre/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/system/database/drivers/sqlite/Makefile.in
+++ b/codepot/src/system/database/drivers/sqlite/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/system/fonts/Makefile.in
+++ b/codepot/src/system/fonts/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/system/helpers/Makefile.in
+++ b/codepot/src/system/helpers/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/system/language/Makefile.in
+++ b/codepot/src/system/language/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -271,7 +271,7 @@ uninstall-wwwDATA:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@ -296,7 +296,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"

 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
--- a/codepot/src/system/language/english/Makefile.in
+++ b/codepot/src/system/language/english/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/system/language/korean/Makefile.in
+++ b/codepot/src/system/language/korean/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/system/libraries/Makefile.in
+++ b/codepot/src/system/libraries/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/system/logs/Makefile.in
+++ b/codepot/src/system/logs/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/system/plugins/Makefile.in
+++ b/codepot/src/system/plugins/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/system/scaffolding/Makefile.in
+++ b/codepot/src/system/scaffolding/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -272,7 +272,7 @@ uninstall-wwwDATA:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@ -297,7 +297,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"

 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
--- a/codepot/src/system/scaffolding/images/Makefile.in
+++ b/codepot/src/system/scaffolding/images/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--- a/codepot/src/system/scaffolding/views/Makefile.in
+++ b/codepot/src/system/scaffolding/views/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,