[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10166] Merge 10108:10165 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10166] Merge 10108:10165 from trunk |
|
Date: |
Tue, 09 Oct 2012 07:54:05 +0000 |
Revision: 10166
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10166
Author: sigurdne
Date: 2012-10-09 07:54:03 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
Merge 10108:10165 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
branches/Version-1_0-branch/logistic/inc/class.menu.inc.php
branches/Version-1_0-branch/logistic/inc/class.soactivity.inc.php
branches/Version-1_0-branch/logistic/inc/class.soproject.inc.php
branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
branches/Version-1_0-branch/logistic/inc/class.uiproject.inc.php
branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
branches/Version-1_0-branch/logistic/inc/model/class.activity.inc.php
branches/Version-1_0-branch/logistic/inc/model/class.bim_item_type_requirement.inc.php
branches/Version-1_0-branch/logistic/inc/model/class.project.inc.php
branches/Version-1_0-branch/logistic/inc/model/class.requirement_value.inc.php
branches/Version-1_0-branch/logistic/setup/phpgw_no.lang
branches/Version-1_0-branch/logistic/setup/setup.inc.php
branches/Version-1_0-branch/logistic/setup/tables_current.inc.php
branches/Version-1_0-branch/logistic/setup/tables_update.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-xmlschema.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-xmlschema03.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/pear/Auth/Container/ADOdb.php
branches/Version-1_0-branch/phpgwapi/inc/class.Mail_mimeDecode.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.db_pdo.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.jqcal.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.jquery.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.odt2xhtml.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.uicommon.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.wiki2html.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.xmlhelper.inc.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/contrib/cssgen.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/actionscript.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/ada.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/apache.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/applescript.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/asm.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/asp.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/bash.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/blitzbasic.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/c.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/c_mac.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/caddcl.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cadlisp.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cfdg.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cfm.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cpp.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/csharp.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/css.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/d.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/delphi.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/diff.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/div.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/dos.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/eiffel.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/fortran.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/gml.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/groovy.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/html4strict.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/idl.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/ini.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/inno.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/java.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/java5.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/javascript.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/lisp.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/lua.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/matlab.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/mpasm.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/mysql.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/nsis.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/objc.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/ocaml-brief.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/ocaml.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/oobas.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/oracle8.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/pascal.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/perl.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/php-brief.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/php.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/python.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/qbasic.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/reg.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/robots.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/ruby.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/sas.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/scheme.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/sdlbasic.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/smalltalk.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/smarty.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/sql.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/tcl.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/text.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/thinbasic.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/tsql.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/vb.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/vbnet.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/vhdl.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/visualfoxpro.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/winbatch.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/xml.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/demo/client/agesort.php
branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
branches/Version-1_0-branch/property/inc/class.import.inc.php
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php
branches/Version-1_0-branch/property/inc/cron/default/import_files.php
branches/Version-1_0-branch/property/js/yahoo/project.edit.js
branches/Version-1_0-branch/property/setup/setup.inc.php
branches/Version-1_0-branch/property/setup/tables_current.inc.php
branches/Version-1_0-branch/property/setup/tables_update.inc.php
branches/Version-1_0-branch/property/tutorials/property/examples/install.apache.sh
Added Paths:
-----------
branches/Version-1_0-branch/logistic/inc/class.sobim_type_requirement.inc.php
branches/Version-1_0-branch/logistic/inc/class.uiallocation.inc.php
branches/Version-1_0-branch/logistic/inc/class.uibim_type_requirement.inc.php
branches/Version-1_0-branch/logistic/js/logistic/activity.js
branches/Version-1_0-branch/logistic/js/logistic/allocation.js
branches/Version-1_0-branch/logistic/js/logistic/bim_type_requirement.js
branches/Version-1_0-branch/logistic/js/logistic/project.js
branches/Version-1_0-branch/logistic/js/logistic/requirement.js
branches/Version-1_0-branch/logistic/templates/base/activity/
branches/Version-1_0-branch/logistic/templates/base/allocation/
branches/Version-1_0-branch/logistic/templates/base/bim_type_requirement_item.xsl
branches/Version-1_0-branch/logistic/templates/base/project/
branches/Version-1_0-branch/logistic/templates/base/requirement/
branches/Version-1_0-branch/phpgwapi/inc/class.phpexcel.inc.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/
Removed Paths:
-------------
branches/Version-1_0-branch/logistic/inc/class.uibooking.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.excelreader.inc.php
branches/Version-1_0-branch/phpgwapi/inc/excelreader/
Property Changed:
----------------
branches/Version-1_0-branch/
branches/Version-1_0-branch/phpgwapi/inc/accounts/class.accounts_.inc.php
branches/Version-1_0-branch/phpgwapi/inc/accounts/class.accounts_ldap.inc.php
branches/Version-1_0-branch/phpgwapi/inc/accounts/class.accounts_sql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/accounts/class.accounts_sqlldap.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-active-record.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-active-recordx.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-csvlib.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-datadict.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-error.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-errorhandler.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-errorpear.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-exceptions.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-iterator.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-lib.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-memcache.lib.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-pager.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-pear.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-perf.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-php4.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-time.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-xmlschema.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-xmlschema03.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/contrib/toxmlrpc.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-access.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-db2.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-firebird.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-generic.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-ibase.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-informix.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-mssql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-mssqlnative.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-oci8.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-postgres.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-sapdb.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-sqlite.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-sybase.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-access.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-ado.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-ado5.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-ado_access.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-ado_mssql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-ads.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-borland_ibase.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-csv.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-db2.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-db2oci.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-db2ora.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-fbsql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-firebird.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-ibase.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-informix.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-mssql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-mssql_n.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-mssqlnative.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-mssqlpo.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-mysql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-mysqlpo.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-mysqlt.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-netezza.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-oci8.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-oci805.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-oci8po.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-odbc_db2.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-odbc_mssql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-odbc_oracle.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-odbtp.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-odbtp_unicode.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-oracle.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-pdo.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-pdo_mssql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-pdo_mysql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-pdo_oci.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-pdo_pgsql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-pdo_sqlite.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-postgres.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-postgres7.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-postgres8.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-proxy.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-sapdb.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-sqlanywhere.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-sqlite.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-sqlitepo.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-sybase.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-sybase_ase.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-vfp.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-ar.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-bg.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-bgutf8.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-ca.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-cn.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-cz.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-da.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-de.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-en.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-es.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-esperanto.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-fa.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-fr.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-hu.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-it.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-nl.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-pl.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-pt-br.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-ro.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-ru1251.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-sv.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-uk1251.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb_th.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/pear/Auth/Container/ADOdb.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/perf/perf-db2.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/perf/perf-informix.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/perf/perf-mssql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/perf/perf-mssqlnative.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/perf/perf-mysql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/perf/perf-oci8.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/perf/perf-postgres.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/pivottable.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/rsfilter.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/server.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-compress-bzip2.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-compress-gzip.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-cryptsession.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-cryptsession2.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-encrypt-mcrypt.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-encrypt-md5.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-encrypt-secret.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-encrypt-sha1.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-session-clob.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-session-clob2.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-session.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-session2.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/crypt.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/old/adodb-cryptsession.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/old/adodb-session-clob.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/old/adodb-session.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/old/crypt.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/benchmark.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/cf~testsessions.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/client.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/pdo.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test-active-record.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test-active-recs2.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test-active-relations.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test-active-relationsx.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test-datadict.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test-perf.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test-pgblob.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test-php5.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test-xmlschema.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test2.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test3.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test4.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test5.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test_rs_array.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/testcache.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/testdatabases.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/testgenid.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/testmssql.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/testoci8.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/testoci8cursor.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/testpaging.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/testpear.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/testsessions.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/time.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/tmssql.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/toexport.inc.php
branches/Version-1_0-branch/phpgwapi/inc/adodb/tohtml.inc.php
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_.inc.php
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_ads.inc.php
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_exchange.inc.php
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_http.inc.php
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_ldap.inc.php
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_mail.inc.php
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_nis.inc.php
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_ntlm.inc.php
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_remoteuser.inc.php
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_sql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_sqlssl.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.EmailAddressValidator.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.Mail_mimeDecode.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.Services_JSON.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.Template.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.Template_experimental.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.account.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.accounts_popup.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.acl.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.applications.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.arrayfunctions.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.asyncservice.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.bojsaddressbook.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.browser.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.cache.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.calendar_holidays.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.categories.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.clientsniffer.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.common.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.config.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_accounts.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_addr.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_addr_type.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_categories.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_central.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_comm.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_comm_descr.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_comm_type.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_note.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_note_type.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_org.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_org_person.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_others.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_person.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_types.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contacts.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contacts_shared.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contacts_sql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.country.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.crypto.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.css.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.csstooltip.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.custom_fields.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.custom_functions.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.data_cleaner.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.datetime.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.db.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.db_adodb.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.db_pdo.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.error.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.errorlog.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.excel.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.gdbutton.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.gdgraph.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.gdimage.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.globally_denied.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.historylog.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.hooks.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.html2pdf.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.html2text.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.http.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.http_dav_client.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.http_svn_client.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.interlink.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.interserver.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.ipc_.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.ipc_manager.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.jasper_wrapper.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.jqcal.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.jquery.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.js.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.jscal.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.jscalendar.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.listbox.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.locations.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.log.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.log_message.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.mail2array.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.mail_handlers.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.mailer_smtp.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.matrixview.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.menu.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.menu_apps.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.menutree.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.mime_magic.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.ms_exchange.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.net_http_client.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.network.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.nextmatchs.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.nextmatchs_xslt.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.object_factory.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.odt2xhtml.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.ofphpgwapi.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.pclzip.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.pdf.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.phpgw.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.ping.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.portalbox.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.preferences.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.resultbox.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.richtext.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.rssparser.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.sbox.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.sbox2.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_array.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_mssql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_mysql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_oracle.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_pgsql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_sapdb.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.send.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.service.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.service_contacts.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.service_notes.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.service_schedule.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.session_handler_db.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.sessions.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.setup.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.setup_detection.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.setup_html.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.setup_process.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.setup_translation.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.shm.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.soap_client.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.sql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.sql_builder.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.sql_criteria.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.sql_entity.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.template_portico.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.translation.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.ui_tools.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.uicommon.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.uijsaddressbook.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.utilities.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.validator.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.vcard.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.vfs.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_dav.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_shared.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_sql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.wiki2html.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.xml.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.xmlhelper.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.xmlrpc_client.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.xmltool.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.xslttemplates.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.yui.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.yuical.inc.php
branches/Version-1_0-branch/phpgwapi/inc/combine.php
branches/Version-1_0-branch/phpgwapi/inc/common_functions.inc.php
branches/Version-1_0-branch/phpgwapi/inc/excel/BIFFwriter.php
branches/Version-1_0-branch/phpgwapi/inc/excel/Format.php
branches/Version-1_0-branch/phpgwapi/inc/excel/OLEwriter.php
branches/Version-1_0-branch/phpgwapi/inc/excel/Parser.php
branches/Version-1_0-branch/phpgwapi/inc/excel/Workbook.php
branches/Version-1_0-branch/phpgwapi/inc/excel/Worksheet.php
branches/Version-1_0-branch/phpgwapi/inc/excel/test.php
branches/Version-1_0-branch/phpgwapi/inc/exchange/class_http.php
branches/Version-1_0-branch/phpgwapi/inc/exchange/class_xml.php
branches/Version-1_0-branch/phpgwapi/inc/exchange/example.php
branches/Version-1_0-branch/phpgwapi/inc/exchange/example_xml.php
branches/Version-1_0-branch/phpgwapi/inc/exchange/image_cache.php
branches/Version-1_0-branch/phpgwapi/inc/exchange/rss_example.php
branches/Version-1_0-branch/phpgwapi/inc/footer.inc.php
branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/contrib/aliased.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/contrib/cssgen.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/contrib/example.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/actionscript.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/ada.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/apache.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/applescript.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/asm.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/asp.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/autoit.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/bash.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/blitzbasic.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/c.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/c_mac.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/caddcl.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cadlisp.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cfdg.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cfm.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cpp.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/csharp.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/css.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/d.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/delphi.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/diff.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/div.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/dos.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/eiffel.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/fortran.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/freebasic.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/gml.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/groovy.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/html4strict.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/idl.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/ini.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/inno.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/java.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/java5.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/javascript.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/latex.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/lisp.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/lua.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/matlab.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/mpasm.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/mysql.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/nsis.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/objc.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/ocaml-brief.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/ocaml.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/oobas.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/oracle8.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/pascal.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/perl.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/php-brief.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/php.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/python.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/qbasic.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/reg.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/robots.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/ruby.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/sas.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/scheme.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/sdlbasic.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/smalltalk.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/smarty.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/sql.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/tcl.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/text.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/thinbasic.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/tsql.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/vb.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/vbnet.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/vhdl.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/visualfoxpro.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/winbatch.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/xml.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/font/courier.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/font/helvetica.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/font/helveticab.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/font/helveticabi.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/font/helveticai.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/font/makefont/makefont.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/font/symbol.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/font/times.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/font/timesb.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/font/timesbi.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/font/timesi.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/font/zapfdingbats.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/fpdf.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/tutorial/calligra.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/tutorial/makefont.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/tutorial/tuto1.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/tutorial/tuto2.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/tutorial/tuto3.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/tutorial/tuto4.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/tutorial/tuto5.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/tutorial/tuto6.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_fpdf/tutorial/tuto7.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_mypdf/00_fpdf_codebar.class.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_mypdf/01_fpdf_bookmark.class.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_mypdf/02_fpdf_formulaire.class.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_mypdf/99_fpdf_protection.class.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/_mypdf/mypdf.class.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/about.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/exemple00.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/exemple01.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/exemple02.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/exemple03.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/exemple04.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/exemple05.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/exemple06.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/exemple07.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/exemple08.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/exemple09.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/exemple10.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/exemple11.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/exemple12.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/exemple13.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/exemple14.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/js1.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/js2.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/js3.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/qrcode.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/regle.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/res/about.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/res/exemple00.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/res/exemple01.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/res/exemple02.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/res/exemple03.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/res/exemple04.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/res/exemple05.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/res/exemple06.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/res/exemple07a.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/res/exemple07b.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/res/exemple08.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/res/exemple09.png.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/res/exemple10.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/res/exemple11.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/res/exemple12.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/res/exemple13.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/exemples/res/exemple14.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/html2pdf.class.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/parsingHTML.class.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/qrcode/qrcode.class.php
branches/Version-1_0-branch/phpgwapi/inc/html2pdf/styleHTML.class.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrCollections.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/AlphaValue.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/Background.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/Border.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/Color.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/Composite.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/Filter.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/Font.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/Length.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/ListStyle.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/Multiple.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/Number.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/Percentage.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/TextDecoration.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/URI.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/Enum.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/HTML/Bool.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/HTML/Color.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/HTML/FrameTarget.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/HTML/ID.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/HTML/Length.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/HTML/LinkTypes.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/HTML/MultiLength.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/HTML/Nmtokens.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/HTML/Pixels.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/Integer.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/Lang.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/Text.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/URI/Email.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/URI/Host.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/URI/IPv4.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/URI/IPv6.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/URI.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/BdoDir.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/BgColor.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/BoolToCSS.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/Border.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/EnumToCSS.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/ImgRequired.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/ImgSpace.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/Lang.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/Length.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/Name.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/ScriptRequired.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTypes.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrValidator.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Bootstrap.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/CSSDefinition.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ChildDef/Chameleon.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ChildDef/Custom.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ChildDef/Empty.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ChildDef/Optional.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ChildDef/Required.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ChildDef/StrictBlockquote.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ChildDef/Table.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ChildDef.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Config.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigDef/Directive.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigDef/DirectiveAlias.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigDef/Namespace.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigDef.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/Builder/Xml.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/Exception.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/Interchange/Directive.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/Interchange/Id.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/Interchange/Namespace.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/Interchange.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/Validator.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/ValidatorAtom.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ContentSets.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Context.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Definition.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/DefinitionCache/Decorator/Memory.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/DefinitionCache/Decorator.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/DefinitionCache/Null.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/DefinitionCache/Serializer.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/DefinitionCache.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/DefinitionCacheFactory.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Doctype.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/DoctypeRegistry.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ElementDef.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Encoder.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/EntityLookup.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/EntityParser.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ErrorCollector.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Exception.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Filter/ExtractStyleBlocks.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Filter/YouTube.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Filter.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Generator.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLDefinition.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Bdo.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/CommonAttributes.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Edit.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Hypertext.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Image.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Legacy.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/List.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Object.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Presentation.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Proprietary.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Ruby.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Scripting.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/StyleAttribute.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Tables.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Target.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Text.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Tidy/Strict.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Tidy/Transitional.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Tidy/XHTML.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Tidy.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModuleManager.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/IDAccumulator.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Injector/AutoParagraph.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Injector/Linkify.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Injector/PurifierLinkify.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Injector.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Language/classes/en-x-test.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Language/messages/en-x-test.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Language/messages/en-x-testmini.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Language/messages/en.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Language.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/LanguageFactory.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Lexer/DOMLex.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Lexer/DirectLex.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Lexer/PEARSax3.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Lexer/PH5P.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Lexer.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/PercentEncoder.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Printer/CSSDefinition.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Printer/ConfigForm.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Printer/HTMLDefinition.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Printer.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Strategy/Composite.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Strategy/Core.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Strategy/FixNesting.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Strategy/MakeWellFormed.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Strategy/RemoveForeignElements.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Strategy/ValidateAttributes.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Strategy.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/StringHash.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/StringHashParser.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/TagTransform/Font.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/TagTransform/Simple.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/TagTransform.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Token/Comment.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Token/Empty.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Token/End.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Token/Start.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Token/Tag.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Token/Text.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Token.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/TokenFactory.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URI.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIDefinition.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIFilter/DisableExternal.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIFilter/DisableExternalResources.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIFilter/HostBlacklist.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIFilter/MakeAbsolute.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIFilter.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIParser.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIScheme/ftp.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIScheme/http.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIScheme/https.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIScheme/mailto.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIScheme/news.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIScheme/nntp.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIScheme.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URISchemeRegistry.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/VarParser/Flexible.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/VarParser/Native.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/VarParser.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/VarParserException.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier.auto.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier.autoload.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier.func.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier.includes.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier.kses.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier.path.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier.php
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier.safe-includes.php
branches/Version-1_0-branch/phpgwapi/inc/log_functions.inc.php
branches/Version-1_0-branch/phpgwapi/inc/mapping/class.mapping_.inc.php
branches/Version-1_0-branch/phpgwapi/inc/mapping/class.mapping_ldap.inc.php
branches/Version-1_0-branch/phpgwapi/inc/mapping/class.mapping_sql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/pclzip/pclzip.lib.php
branches/Version-1_0-branch/phpgwapi/inc/pdf/class.ezpdf.php
branches/Version-1_0-branch/phpgwapi/inc/pdf/class.pdf.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/class.phpmailer.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/class.pop3.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/class.smtp.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/examples/test_db_smtp_basic.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/examples/test_mail_advanced.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/examples/test_mail_basic.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/examples/test_pop_before_smtp_advanced.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/examples/test_pop_before_smtp_basic.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/examples/test_sendmail_advanced.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/examples/test_sendmail_basic.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/examples/test_smtp_advanced.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/examples/test_smtp_advanced_no_auth.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/examples/test_smtp_basic.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/examples/test_smtp_basic_no_auth.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/examples/test_smtp_gmail_advanced.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/examples/test_smtp_gmail_basic.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-ar.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-br.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-ca.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-ch.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-cz.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-de.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-dk.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-es.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-et.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-fi.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-fo.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-fr.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-hu.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-it.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-ja.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-nl.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-no.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-pl.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-ro.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-ru.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-se.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-tr.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-zh.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-zh_cn.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/test/phpmailerTest.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/test/test_callback.php
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/test/testemail.php
branches/Version-1_0-branch/phpgwapi/inc/soap_functions.inc.php
branches/Version-1_0-branch/phpgwapi/inc/soaplib.soapinterop.php
branches/Version-1_0-branch/phpgwapi/inc/sql/class.sql_mssql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/sql/class.sql_mysql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/sql/class.sql_oracle.inc.php
branches/Version-1_0-branch/phpgwapi/inc/sql/class.sql_pgsql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/sql/class.sql_sapdb.inc.php
branches/Version-1_0-branch/phpgwapi/inc/sso/create_account.php
branches/Version-1_0-branch/phpgwapi/inc/sso/create_mapping.php
branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
branches/Version-1_0-branch/phpgwapi/inc/sso/login_server.php
branches/Version-1_0-branch/phpgwapi/inc/wiki2html/markdown/markdown.php
branches/Version-1_0-branch/phpgwapi/inc/wiki2html/textile/Textile.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/debugger/action.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/debugger/common.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/debugger/controller.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/debugger/index.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/demo/client/agesort.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/demo/client/client.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/demo/client/comment.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/demo/client/introspect.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/demo/client/mail.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/demo/client/simple_call.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/demo/client/which.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/demo/client/wrap.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/demo/client/zopetest.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/demo/server/discuss.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/demo/server/proxy.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/demo/server/server.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/demo/vardemo.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/test/PHPUnit/Assert.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/test/PHPUnit/TestCase.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/test/PHPUnit/TestDecorator.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/test/PHPUnit/TestFailure.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/test/PHPUnit/TestListener.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/test/PHPUnit/TestResult.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/test/PHPUnit/TestSuite.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/test/benchmark.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/test/parse_args.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/test/phpunit.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/test/testsuite.php
branches/Version-1_0-branch/phpgwapi/inc/xmlrpc/test/verify_compat.php
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
2012-10-09 07:12:10 UTC (rev 10165)
+++
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
2012-10-09 07:54:03 UTC (rev 10166)
@@ -13,7 +13,7 @@
(
'fix_duplicates' => true,
);
-
+
/**
* Get a static reference to the storage object associated with this
model object
*
@@ -92,9 +92,9 @@
$filter_clauses = array();
$filter_clauses[] = "show_in_portal=1";
$filter_clauses[] = "NOT org.name=''";
-
+
$use_local_org = false;
-
+
if(isset($filters[$this->get_id_field_name()])){
$id =
$this->marshal($filters[$this->get_id_field_name()],'int');
$filter_clauses[] = "org.id = {$id}";
@@ -131,7 +131,7 @@
}
$condition = join(' AND ', $clauses);
-
+
if($use_local_org)
{
if($return_count) // We should only return a count
@@ -155,10 +155,10 @@
$columns[] = 'org.transferred';
$columns[] = 'org.original_org_id';
$columns[] = 'org.orgno AS organization_number';
-
+
$cols = implode(',',$columns);
}
-
+
$tables = "activity_organization org";
}
else
@@ -189,13 +189,13 @@
$columns[] = 'org.customer_internal';
$columns[] = 'org.shortname';
$columns[] = 'org.show_in_portal';
-
+
$cols = implode(',',$columns);
}
-
- $tables = "bb_organization org";
+
+ $tables = "bb_organization org";
}
-
+
//var_dump("SELECT {$cols} FROM {$tables} WHERE {$condition}
{$order}");
return "SELECT {$cols} FROM {$tables} WHERE {$condition}
{$order}";
}
@@ -211,10 +211,10 @@
$result = $this->db->f('name');
}
}
-
+
return $result;
}
-
+
function get_duplicates()
{
$result = array();
@@ -249,7 +249,7 @@
//_debug_array($result);
return $result;
}
-
+
function fix_duplicates()
{
$so_activity = CreateObject('activitycalendar.soactivity');
@@ -267,7 +267,7 @@
foreach($orgs2 as $o2)
{
$removeId = $o2['orgid'];
- //var_dump($removeId .':'.$curr_id .
'<br/>');
+ //var_dump($removeId .':'.$curr_id .
'<br/>');
if($removeId != $curr_id &&
$o2['orgname'] == $tmpName)
{
//var_dump($removeId.'-' .
$o2['orgname'].' skal fjernes <br/>');
@@ -278,7 +278,7 @@
$org['removed_org'] = $removeId;
$removed_orgs[] = $removeId;
$orgmappings[$curr_id][] =
$removeId;
-
+
//unset($orgs1[$removeId]);
}
}
@@ -287,7 +287,7 @@
}
// _debug_array($new_orgs);
// _debug_array($orgmappings);
-
+
$this->db->transaction_begin();
//loop through activities and update organization-connection
foreach($orgmappings as $key => $value)
@@ -326,7 +326,7 @@
}
}
}
-
+
//loop through organizations and update them.
foreach($new_orgs as $no)
{
@@ -335,10 +335,10 @@
var_dump("Oppdaterer organisasjon
".$no['orgid'].','.$no['orgname'].' med ny adresse.<br/>');
$this->update_organization_with_new_info($no);
}
-
+
$this->db->transaction_commit();
}
-
+
function get_organization_name_local($org_id)
{
$result = "Ingen";
@@ -349,10 +349,10 @@
$result = $this->db->f('name');
}
}
-
+
return $result;
}
-
+
function get_contacts($organization_id)
{
$contacts = array();
@@ -367,7 +367,7 @@
}
return $contacts;
}
-
+
function get_contacts_as_objects($organization_id)
{
$contacts = array();
@@ -386,8 +386,8 @@
}
return $contacts;
}
-
-
+
+
function get_contacts_local($organization_id)
{
$contacts = array();
@@ -403,7 +403,7 @@
}
return $contacts;
}
-
+
function get_contacts_local_as_objects($organization_id)
{
$contacts = array();
@@ -423,7 +423,7 @@
}
return $contacts;
}
-
+
function get_description($organization_id)
{
if(isset($organization_id)){
@@ -435,7 +435,7 @@
}
return $desc;
}
-
+
function get_description_local($organization_id)
{
if(isset($organization_id)){
@@ -447,17 +447,17 @@
}
return $desc;
}
-
-
+
+
function get_district_from_name($name)
{
$this->db->query("SELECT part_of_town_id FROM fm_part_of_town
where name like UPPER('%{$name}%') ", __LINE__, __FILE__);
while($this->db->next_record()){
$result = $this->db->f('part_of_town_id');
- }
+ }
return $result;
}
-
+
function get_office_from_district($district_id)
{
if($district_id)
@@ -506,7 +506,7 @@
$change_type = $organization->get_change_type();
$transferred = ($organization->get_transferred() == 1 ||
$organization->get_transferred() == true)?'true':'false';
$original_org_id = ($organization->get_original_org_id() &&
$organization->get_original_org_id() !=
'')?$organization->get_original_org_id():0;
-
+
$values[] = "NAME='{$name}'";
$values[] = "HOMEPAGE='{$homepage}'";
$values[] = "PHONE='{$phone}'";
@@ -522,7 +522,7 @@
$values[] = "TRANSFERRED={$transferred}";
$values[] = "ORIGINAL_ORG_ID={$original_org_id}";
$vals = implode(',',$values);
-
+
$sql = "UPDATE activity_organization SET {$vals} WHERE
ID={$organization->get_id()}";
$result = $this->db->query($sql, __LINE__, __FILE__);
if(isset($result))
@@ -577,7 +577,7 @@
}
return $organization;
}
-
+
function add_organization_local($organization)
{
$name = $organization->get_name();
@@ -589,14 +589,14 @@
$city = $organization->get_city();
if($organization->get_original_org_id() &&
$organization->get_original_org_id() != '')
{
- $original_org_id =
$organization->get_original_org_id();
+ $original_org_id = $organization->get_original_org_id();
}
else
{
$original_org_id = 0;
}
-
-
+
+
$values[] = "NAME='{$name}'";
$values[] = "HOMEPAGE='{$homepage}'";
$values[] = "ADDRESS='{$street}'";
@@ -606,7 +606,7 @@
$values[] = "ORGNO='{$orgnr}'";
$values[] = "ORIGINAL_ORG_ID={$original_org_id}";
$vals = implode(',',$values);
-
+
//var_dump("INSERT INTO activity_organization ({$cols}) VALUES
({$vals})");
$sql = "UPDATE activity_organization SET {$vals} WHERE
ID={$organization->get_id()}";
$result = $this->db->query($sql, __LINE__, __FILE__);
@@ -619,7 +619,7 @@
return false;
}
}
-
+
function transfer_organization($org_info)
{
$name = $org_info['name'];
@@ -632,8 +632,8 @@
$district = $org_info['district'];
$city = $org_info['postaddress'];
$activity_id = 1;
- $show_in_portal = 1;
-
+ $show_in_portal = 1;
+
$columns[] = 'name';
$columns[] = 'homepage';
$columns[] = 'phone';
@@ -647,7 +647,7 @@
$columns[] = 'activity_id';
$columns[] = 'show_in_portal';
$cols = implode(',',$columns);
-
+
$values[] = "'{$name}'";
$values[] = "'{$homepage}'";
$values[] = "''";
@@ -661,7 +661,7 @@
$values[] = $this->marshal($activity_id, 'int');
$values[] = $show_in_portal;
$vals = implode(',',$values);
-
+
$sql = "INSERT INTO bb_organization ({$cols}) VALUES ({$vals})";
$result = $this->db->query($sql, __LINE__, __FILE__);
if(isset($result))
@@ -673,7 +673,7 @@
return 0;
}
}
-
+
function get_organization_local($org_id)
{
$sql = "SELECT * FROM activity_organization WHERE id={$org_id}";
@@ -682,7 +682,7 @@
while($this->db->next_record())
{
$organization = new activitycalendar_organization((int)
$this->db->f('id'));
-
+
$organization->set_name($this->unmarshal($this->db->f('name'), 'string'));
$organization->set_organization_number($this->unmarshal($this->db->f('organization_number'),
'int'));
$organization->set_address($this->unmarshal($this->db->f('address'), 'string'));
@@ -698,11 +698,11 @@
$organization->set_transferred($this->unmarshal($this->db->f('transferred'),
'bool'));
$organization->set_show_in_portal($this->unmarshal($this->db->f('show_in_portal'),
'int'));
$organization->set_original_org_id($this->unmarshal($this->db->f('original_org_id'),
'int'));
-
+
return $organization;
}
}
-
+
function update_organization($org_info)
{
$name = $org_info['name'];
@@ -740,8 +740,8 @@
$district = '';
}
$activity_id = 1;
- $show_in_portal = 1;
-
+ $show_in_portal = 1;
+
$values = array(
'name = ' . $this->marshal($name, 'string'),
'homepage = ' . $this->marshal($homepage, 'string'),
@@ -758,7 +758,7 @@
$result = $this->db->query('UPDATE bb_organization SET ' .
join(',', $values) . " WHERE id=$orgid", __LINE__,__FILE__);
}
-
+
function update_organization_with_new_info($organization)
{
$name = $organization['orgname'];
@@ -777,8 +777,8 @@
if(!$city)
{
$city = '';
- }
-
+ }
+
$values = array(
'street = ' . $this->marshal($street, 'string'),
'zip_code = ' . $this->marshal($zip, 'string'),
@@ -787,7 +787,7 @@
//var_dump("UPDATE bb_organization SET " . join(',', $values) .
" WHERE id=$orgid");
$result = $this->db->query('UPDATE bb_organization SET ' .
join(',', $values) . " WHERE id=$orgid", __LINE__,__FILE__);
}
-
+
function set_organization_inactive($org_id)
{
$orgid = (int)$org_id;
@@ -795,7 +795,7 @@
//var_dump("UPDATE bb_organization SET active=0,
show_in_portal=0 WHERE id={$orgid}");
$result = $this->db->query("UPDATE bb_organization SET
active=0, show_in_portal=0 WHERE id={$orgid}", __LINE__,__FILE__);
}
-
+
function get_affected_allocations($org_id)
{
$result = array();
@@ -804,15 +804,15 @@
while($this->db->next_record()){
$result[] = $this->db->f('id');
}
-
+
return $result;
}
-
+
function update_affected_allocations($id, $org_id)
{
$result = $this->db->query("update bb_allocation set
organization_id={$org_id} where id={$id}", __LINE__, __FILE__);
}
-
+
function get_affected_reservations($org_id)
{
$result = array();
@@ -821,15 +821,15 @@
while($this->db->next_record()){
$result[] = $this->db->f('id');
}
-
+
return $result;
}
-
+
function update_affected_reservations($id, $org_id)
{
$result = $this->db->query("update bb_completed_reservation set
organization_id={$org_id} where id={$id}", __LINE__, __FILE__);
}
-
+
function get_affected_events($org_id)
{
$result = array();
@@ -838,20 +838,20 @@
while($this->db->next_record()){
$result[] = $this->db->f('id');
}
-
+
return $result;
}
-
+
function update_affected_events($id, $org_id)
{
$result = $this->db->query("update bb_event set
customer_organization_id={$org_id} where id={$id}", __LINE__, __FILE__);
}
-
+
function update($organization)
{
return false;
}
-
+
function update_org_district_local($org_id, $district_id)
{
$sql = "UPDATE activity_organization SET district='{$district_id}'
WHERE ID={$org_id}";
@@ -865,5 +865,36 @@
return false;
}
}
+
+ function get_organization_homepage($org_id)
+ {
+ $result = "Ingen";
+ if(isset($org_id)){
+ $org_id = intval($org_id);
+ $q1="SELECT homepage FROM bb_organization WHERE
id={$org_id}";
+ $this->db->query($q1, __LINE__, __FILE__);
+ while($this->db->next_record())
+ {
+ $result = $this->db->f('homepage');
+ }
+ }
+
+ return $result;
+ }
+
+ function get_organization_homepage_local($org_id)
+ {
+ $result = "Ingen";
+ if(isset($org_id)){
+ $q1="SELECT homepage FROM activity_organization WHERE
id={$org_id}";
+ $this->db->query($q1, __LINE__, __FILE__);
+ while($this->db->next_record())
+ {
+ $result = $this->db->f('homepage');
+ }
+ }
+
+ return $result;
+ }
}
?>
Modified:
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
2012-10-09 07:12:10 UTC (rev 10165)
+++
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
2012-10-09 07:54:03 UTC (rev 10166)
@@ -8,7 +8,7 @@
class activitycalendar_activity extends activitycalendar_model
{
public static $so;
-
+
protected $id;
protected $title;
protected $organization_id;
@@ -33,123 +33,123 @@
protected $frontend;
protected $new_org;
protected $new_group;
-
+
/**
* Constructor. Takes an optional ID. If a contract is
created from outside
* the database the ID should be empty so the database can add
one according to its logic.
- *
+ *
* @param int $id the id of this composite
*/
public function __construct(int $id = null)
{
$this->id = (int)$id;
}
-
+
public function set_id($id)
{
$this->id = $id;
}
-
+
public function get_id() { return $this->id; }
-
+
public function set_title($title)
{
$this->title = $title;
}
-
+
public function get_title() { return $this->title; }
-
+
public function set_organization_id($organization_id)
{
$this->organization_id = $organization_id;
}
-
+
public function get_organization_id() { return
$this->organization_id; }
public function set_group_id($group_id)
{
$this->group_id = $group_id;
}
-
+
public function get_group_id() { return $this->group_id; }
-
+
public function set_district($district)
{
$this->district = $district;
}
-
+
public function get_district() { return $this->district; }
-
+
public function set_office($office)
{
$this->office = $office;
}
-
+
public function get_office() { return $this->office; }
-
+
public function set_target($target)
{
$this->target = $target;
}
-
+
public function get_target() { return $this->target; }
-
+
public function set_category($category)
{
$this->category = $category;
}
-
+
public function get_category() { return $this->category; }
-
+
public function set_description($description)
{
$this->description = $description;
}
-
+
public function get_description() { return $this->description; }
-
+
public function set_state($state)
{
$this->state = $state;
}
-
+
public function get_state() { return $this->state; }
-
+
public function set_arena($arena)
{
$this->arena = $arena;
}
-
+
public function get_arena() { return $this->arena; }
-
+
public function set_time($time)
{
$this->time = $time;
}
-
+
public function get_time() { return $this->time; }
-
+
/* public function set_date_end($date_end)
{
$this->date_end = $date_end;
}
-
+
public function get_date_end() { return $this->date_end; }*/
-
+
public function set_create_date($create_date)
{
$this->create_date = $create_date;
}
-
+
public function get_create_date() { return $this->create_date; }
-
+
public function get_last_change_date() { return
$this->last_change_date; }
-
+
public function set_last_change_date($last_change_date)
{
$this->last_change_date = $last_change_date;
}
-
+
public function set_contact_persons($persons)
{
$count=0;
@@ -166,81 +166,81 @@
$count++;
}
}
-
+
public function set_contact_person_1($contact_person_1)
{
$this->contact_person_1 = $contact_person_1;
}
-
+
public function get_contact_person_1() { return
$this->contact_person_1; }
-
+
public function set_contact_person_2($contact_person_2)
{
$this->contact_person_2 = $contact_person_2;
}
-
+
public function get_contact_person_2() { return
$this->contact_person_2; }
-
+
public function
set_contact_person_2_address($contact_person_2_address)
{
$this->contact_person_2_address =
$contact_person_2_address;
}
-
+
public function get_contact_person_2_address() { return
$this->contact_person_2_address; }
-
+
public function set_contact_person_2_zip($contact_person_2_zip)
{
$this->contact_person_2_zip = $contact_person_2_zip;
}
-
+
public function get_contact_person_2_zip() { return
$this->contact_person_2_zip; }
-
+
public function set_special_adaptation($special_adaptation)
{
$this->special_adaptation = $special_adaptation;
}
-
+
public function get_special_adaptation() { return
$this->special_adaptation; }
-
+
public function set_secret($secret)
{
$this->secret = $secret;
}
-
+
public function get_secret() { return $this->secret; }
-
+
public function set_internal_arena($internal_arena)
{
$this->internal_arena = $internal_arena;
}
-
+
public function get_internal_arena() { return
$this->internal_arena; }
-
+
public function set_frontend(bool $frontend)
{
$this->frontend = (bool)$frontend;
}
-
+
public function get_frontend() { return $this->frontend; }
-
+
public function set_new_org(bool $new_org)
{
$this->new_org = (bool)$new_org;
}
-
+
public function get_new_org() { return $this->new_org; }
-
+
public function set_new_group(bool $new_group)
{
$this->new_group = (bool)$new_group;
}
-
+
public function get_new_group() { return $this->new_group; }
-
-
+
+
/**
* Get a static reference to the storage object associated with
this model object
- *
+ *
* @return the storage object
*/
public static function get_so()
@@ -248,10 +248,10 @@
if (self::$so == null) {
self::$so =
CreateObject('activitycalendar.soactivity');
}
-
+
return self::$so;
}
-
+
public function serialize()
{
$so_org = activitycalendar_soorganization::get_instance();
@@ -288,7 +288,7 @@
}
$desc =
activitycalendar_sogroup::get_instance()->get_description($this->get_group_id());
}
- $o_id = $this->get_organization_id();
+ $o_id = $this->get_organization_id();
if($this->get_new_org())
{
$org_name =
$so_org->get_organization_name_local($o_id);
@@ -297,7 +297,7 @@
{
$org_name =
$so_org->get_organization_name($o_id);
}
-
+
}
else if(isset($this->organization_id) &&
$this->get_organization_id() > 0)
{
@@ -331,13 +331,13 @@
}
$desc =
activitycalendar_soorganization::get_instance()->get_description($this->get_organization_id());
}
- }
+ }
else
{
$contact_1 = "";
$contact_2 = "";
}
-
+
if($this->get_internal_arena() &&
$this->get_internal_arena() > 0)
{
$arena_name =
activitycalendar_soarena::get_instance()->get_building_name($this->get_internal_arena());
@@ -346,9 +346,9 @@
{
$arena_name =
activitycalendar_soarena::get_instance()->get_arena_name($this->get_arena());
}
-
+
$activity_district =
$this->get_so()->get_district_name($this->get_district());
-
+
return array(
'id' => $this->get_id(),
'title' => $this->get_title(),
@@ -368,7 +368,7 @@
'frontend' => $this->get_frontend()
);
}
-
+
public function serialize_for_export()
{
$so_org = activitycalendar_soorganization::get_instance();
@@ -405,22 +405,25 @@
}
$desc =
activitycalendar_sogroup::get_instance()->get_description($this->get_group_id());
}
- $o_id = $this->get_organization_id();
+ $o_id = $this->get_organization_id();
if($this->get_new_org())
{
$org_name =
$so_org->get_organization_name_local($o_id);
+ $org_homepage =
$so_org->get_organization_homepage_local($o_id);
}
else
{
$org_name =
$so_org->get_organization_name($o_id);
+ $org_homepage =
$so_org->get_organization_homepage($o_id);
}
-
+
}
else if(isset($this->organization_id) &&
$this->get_organization_id() > 0)
{
if($this->get_new_org())
{
$org_name =
activitycalendar_soorganization::get_instance()->get_organization_name_local($this->get_organization_id());
+ $org_homepage =
$so_org->get_organization_homepage_local($this->get_organization_id());
$this->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_local_contact_persons($this->get_organization_id()));
$contact_1 =
activitycalendar_socontactperson::get_instance()->get_org_contact_name_local($this->get_contact_person_1()->get_id());
if($this->get_contact_person_2())
@@ -436,6 +439,7 @@
else
{
$org_name =
activitycalendar_soorganization::get_instance()->get_organization_name($this->get_organization_id());
+ $org_homepage =
$so_org->get_organization_homepage($this->get_organization_id());
$this->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($this->get_organization_id()));
$contact_1 =
activitycalendar_socontactperson::get_instance()->get_org_contact_name($this->get_contact_person_1()->get_id());
if($this->get_contact_person_2())
@@ -448,13 +452,13 @@
}
$desc =
activitycalendar_soorganization::get_instance()->get_description($this->get_organization_id());
}
- }
+ }
else
{
$contact_1 = "";
$contact_2 = "";
}
-
+
if($this->get_internal_arena() &&
$this->get_internal_arena() > 0)
{
$arena_name =
activitycalendar_soarena::get_instance()->get_building_name($this->get_internal_arena());
@@ -463,20 +467,21 @@
{
$arena_name =
activitycalendar_soarena::get_instance()->get_arena_name($this->get_arena());
}
-
+
$activity_district =
$this->get_so()->get_district_name($this->get_district());
-
+
$contact_person_1_name =
$this->get_contact_person_1()?$this->get_contact_person_1()->get_name():'';
$contact_person_1_phone =
$this->get_contact_person_1()?$this->get_contact_person_1()->get_phone():'';
$contact_person_1_mail =
$this->get_contact_person_1()?$this->get_contact_person_1()->get_email():'';
$contact_person_2_name =
$this->get_contact_person_2()?$this->get_contact_person_2()->get_name():'';
$contact_person_2_phone =
$this->get_contact_person_2()?$this->get_contact_person_2()->get_phone():'';
$contact_person_2_mail =
$this->get_contact_person_2()?$this->get_contact_person_2()->get_email():'';
-
+
return array(
'id' => $this->get_id(),
'title' => $this->get_title(),
'organization_id' => $org_name,
+ 'organization_homepage' => $org_homepage,
'group_id' => $group_name,
'district' => $activity_district,
'office' =>
activitycalendar_soactivity::get_instance()->get_office_name($this->get_office()),
Modified: branches/Version-1_0-branch/logistic/inc/class.menu.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.menu.inc.php 2012-10-09
07:12:10 UTC (rev 10165)
+++ branches/Version-1_0-branch/logistic/inc/class.menu.inc.php 2012-10-09
07:54:03 UTC (rev 10166)
@@ -67,18 +67,18 @@
'url' => $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
'logistic.uirequirement.index') ),
'image' => array('property', 'location_tenant'),
),
- 'booking' =>
array
+ 'allocation' =>
array
(
-
'text' => lang('booking'),
-
'url' => $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
'logistic.uibooking.index') ),
+
'text' => lang('allocation'),
+
'url' => $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
'logistic.uiallocation.index') ),
'image' => array('property', 'location_tenant'),
),
)
- )
+ )
);
-
+
if ( $GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin')
- || $GLOBALS['phpgw']->acl->check('admin',
phpgwapi_acl::ADD, 'controller'))
+ || $GLOBALS['phpgw']->acl->check('admin',
phpgwapi_acl::ADD, 'logistic'))
{
$menus['admin'] = array
(
@@ -97,6 +97,10 @@
'text' => lang('Project
types'),
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'logistic.uiproject.project_types') )
),
+ 'bim_type_requirement' => array(
+ 'text' => lang('Bim type
requirement'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'logistic.uibim_type_requirement.index') )
+ )
/* 'control_cats' => array
(
'text' => lang('Control area'),
@@ -115,7 +119,7 @@
)*/
);
}
-
+
$menus['folders'] =
phpgwapi_menu::get_categories('bergen');
$GLOBALS['phpgw_info']['flags']['currentapp'] =
$incoming_app;
Modified: branches/Version-1_0-branch/logistic/inc/class.soactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.soactivity.inc.php
2012-10-09 07:12:10 UTC (rev 10165)
+++ branches/Version-1_0-branch/logistic/inc/class.soactivity.inc.php
2012-10-09 07:54:03 UTC (rev 10166)
@@ -58,6 +58,8 @@
'start_date',
'end_date',
'responsible_user_id',
+ 'create_user',
+ 'create_date',
'update_user',
'update_date'
);
@@ -70,6 +72,8 @@
$this->marshal($activity->get_start_date(),
'int'),
$this->marshal($activity->get_end_date(),
'int'),
$this->marshal($activity->get_responsible_user_id(), 'int'),
+ $this->marshal($activity->get_create_user(),
'int'),
+ $this->marshal(strtotime('now'), 'int'),
$this->marshal($activity->get_update_user(),
'int'),
$this->marshal(strtotime('now'), 'int')
);
@@ -210,6 +214,8 @@
$activity->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
$activity->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
$activity->set_responsible_user_id($this->unmarshal($this->db->f('responsible_user_id'),
'int'));
+
$activity->set_create_date($this->unmarshal($this->db->f('create_date'),
'int'));
+
$activity->set_create_user($this->unmarshal($this->db->f('create_user'),
'int'));
$activity->set_update_date($this->unmarshal($this->db->f('update_date'),
'int'));
$activity->set_update_user($this->unmarshal($this->db->f('update_user'),
'int'));
}
Copied:
branches/Version-1_0-branch/logistic/inc/class.sobim_type_requirement.inc.php
(from rev 10165, trunk/logistic/inc/class.sobim_type_requirement.inc.php)
===================================================================
---
branches/Version-1_0-branch/logistic/inc/class.sobim_type_requirement.inc.php
(rev 0)
+++
branches/Version-1_0-branch/logistic/inc/class.sobim_type_requirement.inc.php
2012-10-09 07:54:03 UTC (rev 10166)
@@ -0,0 +1,188 @@
+<?php
+
+ /**
+ * phpGroupWare - logistic: a part of a Facilities Management System.
+ *
+ * @author Erik Holm-Larsen <address@hidden>
+ * @copyright Copyright (C) 2011,2012 Free Software Foundation, Inc.
http://www.fsf.org/
+ * This file is part of phpGroupWare.
+ *
+ * phpGroupWare is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * phpGroupWare is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with phpGroupWare; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
+ *
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @internal Development of this application was funded by
http://www.bergen.kommune.no/
+ * @package property
+ * @subpackage logistic
+ * @version $Id: class.soproject.inc.php 10111 2012-10-04 08:53:35Z
erikhl $
+ */
+
+ phpgw::import_class('logistic.socommon');
+
+ include_class('logistic', 'bim_item_type_requirement', 'inc/model/');
+
+ class logistic_sobim_type_requirement extends logistic_socommon
+ {
+ protected static $so;
+ private $local_db;
+
+ public function __construct()
+ {
+ parent::__construct();
+ $this->local_db = clone $this->db;
+ }
+
+ protected function add(&$object)
+ {
+ $user_id = $GLOBALS['phpgw_info']['user']['id'];
+ $now = time();
+ $entity_id = $object->get_entity_id();
+ $category_id = $object->get_category_id();
+ $cust_attribute_id = $object->get_cust_attribute_id();
+ $type_id = $object->get_project_type_id();
+
+ $sql = "INSERT INTO lg_bim_item_type_requirement
(entity_id, category_id, cust_attribute_id, project_type_id, create_user,
create_date) VALUES ($entity_id,$category_id,'$cust_attribute_id',$type_id,
$user_id, $now)";
+ $result = $this->db->query($sql, __LINE__,__FILE__);
+
+ if($result)
+ {
+ // Set the new bim_item_type_requirement ID
+ return
$this->db->get_last_insert_id('lg_bim_item_type_requirement', 'id');
+ }
+ else
+ {
+ return 0;
+ }
+ }
+
+ protected function get_id_field_name()
+ {
+ if(!$extended_info)
+ {
+ $ret = 'id';
+ }
+ else
+ {
+ $ret = array
+ (
+ 'table' =>
'type_requirement', // alias
+ 'field' => 'id',
+ 'translated' => 'id'
+ );
+ }
+
+ return $ret;
+ }
+
+ protected function get_query(string $sort_field, boolean
$ascending, string $search_for, string $search_type, array $filters, boolean
$return_count)
+ {
+ $clauses = array('1=1');
+
+ /*if($search_for)
+ {
+ $like_pattern = "'%" .
$this->db->db_addslashes($search_for) . "%'";
+ $like_clauses = array();
+ switch($search_type)
+ {
+ default:
+ $like_clauses[] =
"{$table_alias}.name $this->like $like_pattern";
+ break;
+ }
+ if(count($like_clauses))
+ {
+ $clauses[] = '(' . join(' OR ',
$like_clauses) . ')';
+ }
+ }*/
+
+ $filter_clauses = array();
+ if(isset($filters[$this->get_id_field_name()]))
+ {
+ $filter_clauses[] = "type_requirement.id =
{$this->marshal($filters[$this->get_id_field_name()],'int')}";
+ }
+
+ if(count($filter_clauses))
+ {
+ $clauses[] = join(' AND ', $filter_clauses);
+ }
+
+ $condition = join(' AND ', $clauses);
+
+ //$joins = " {$this->left_join} controller_control_area
ON (controller_procedure.control_area_id = controller_control_area.id)";
+
+ $tables = "lg_bim_item_type_requirement
type_requirement";
+
+ if($return_count) // We should only return a count
+ {
+ $cols = 'COUNT(DISTINCT(type_requirement.id))
AS count';
+ }
+ else
+ {
+ $cols .= "type_requirement.* ";
+ }
+
+ $dir = $ascending ? 'ASC' : 'DESC';
+ $order = $sort_field ? "ORDER BY
{$this->marshal($sort_field, 'field')} $dir ": '';
+
+ //var_dump("SELECT {$cols} FROM {$tables} {$joins}
WHERE {$condition} {$order}");
+
+ return "SELECT {$cols} FROM {$tables} WHERE
{$condition} {$order}";
+ }
+
+ protected function populate(int $req_id,
&$bim_item_type_requirement)
+ {
+ if($bim_item_type_requirement == null)
+ {
+ $bim_item_type_requirement = new
logistic_bim_item_type_requirement((int) $req_id);
+
+
$bim_item_type_requirement->set_entity_id($this->unmarshal($this->db->f('entity_id'),
'int'));
+
$bim_item_type_requirement->set_category_id($this->unmarshal($this->db->f('category_id'),
'int'));
+
$bim_item_type_requirement->set_cust_attribute_id($this->unmarshal($this->db->f('cust_attribute_id'),
'string'));
+
$bim_item_type_requirement->set_project_type_id($this->unmarshal($this->db->f('project_type_id'),
'int'));
+ }
+
+ return $bim_item_type_requirement;
+ }
+
+ protected function update($object)
+ {
+ $id = intval($object->get_id());
+
+ $values = array(
+ 'entity_id = ' .
$this->marshal($object->get_entity_id(), 'int'),
+ 'category_id = ' .
$this->marshal($object->get_category_id(), 'int'),
+ 'cust_attribute_id = ' .
$this->marshal($object->get_cust_attribute_id(), 'string'),
+ 'project_type_id = ' .
$this->marshal($object->get_project_type_id(), 'int')
+ );
+
+ $result = $this->db->query('UPDATE
lg_bim_item_type_requirement SET ' . join(',', $values) . " WHERE id=$id",
__LINE__,__FILE__);
+
+ if( $result )
+ {
+ return $id;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+
+ public static function get_instance()
+ {
+ if (self::$so == null)
+ {
+ self::$so =
CreateObject('logistic.sobim_type_requirement');
+ }
+ return self::$so;
+ }
+ }
Modified: branches/Version-1_0-branch/logistic/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.soproject.inc.php
2012-10-09 07:12:10 UTC (rev 10165)
+++ branches/Version-1_0-branch/logistic/inc/class.soproject.inc.php
2012-10-09 07:54:03 UTC (rev 10166)
@@ -35,7 +35,14 @@
class logistic_soproject extends logistic_socommon
{
protected static $so;
+ protected $db3;
+ public function __construct()
+ {
+ parent::__construct();
+ $this->db3 = clone $this->db;
+ }
+
/**
* Get a static reference to the storage object associated with
this model object
*
@@ -146,7 +153,7 @@
{
$filter_clauses[] = "{$table_alias}.id =
{$this->marshal($filters[$this->get_id_field_name()],'int')}";
}
- if(isset($filters['project_type']) &&
!$filters['project_type'] == '')
+ if(isset($filters['project_type']) &&
(!$filters['project_type'] == '' || !$filters['project_type'] == 0))
{
$filter_clauses[] =
"{$table_alias}.project_type_id = {$this->marshal($filters['project_type'],
'int')}";
}
@@ -175,7 +182,7 @@
}
else
{
- $cols .= "* ";
+ $cols .= "$table_alias.* ";
}
$dir = $ascending ? 'ASC' : 'DESC';
@@ -183,7 +190,7 @@
//var_dump("SELECT {$cols} FROM {$tables} {$joins}
WHERE {$condition} {$order}");
- return "SELECT {$cols} FROM {$tables} {$joins} WHERE
{$condition} {$order}";
+ return "SELECT {$cols} FROM {$tables} WHERE
{$condition} {$order}";
}
protected function populate(int $project_id, &$project)
@@ -226,34 +233,55 @@
}
- private function get_project_type_label($id)
+ public function get_project_type_label($id)
{
$sql = "SELECT name FROM lg_project_type where id=$id";
- $this->db->query($sql, __LINE__, __FILE__);
+ $this->db3->query($sql, __LINE__, __FILE__);
- while ($this->db->next_record())
+ while ($this->db3->next_record())
{
- return $this->db->f('name');
+ return $this->db3->f('name');
}
}
- public function get_project_types()
+ public function get_project_types($selected_id = null)
{
$project_type_array = array();
- $project_type_array[] = array(
- 'id' => '',
- 'name' => lang('all_types'),
- 'selected' => 1
- );
+ if(!$selected_id)
+ {
+ $project_type_array[] = array(
+ 'id' => '',
+ 'name' => lang('all_types'),
+ 'selected' => 1
+ );
+ }
+ else
+ {
+ $project_type_array[] = array(
+ 'id' => '',
+ 'name' => lang('all_types')
+ );
+ }
$sql = "SELECT * FROM lg_project_type";
$this->db->query($sql, __LINE__, __FILE__);
while ($this->db->next_record())
{
+ if(!$selected_id == null && $this->db->f('id')
== $selected_id)
+ {
$project_type_array[] = array(
'id' => $this->db->f('id'),
+ 'name' =>
$this->unmarshal($this->db->f('name'), 'string'),
+ 'selected' => 1
+ );
+ }
+ else
+ {
+ $project_type_array[] = array(
+ 'id' => $this->db->f('id'),
'name' =>
$this->unmarshal($this->db->f('name'), 'string')
);
+ }
}
return $project_type_array;
}
Modified: branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
2012-10-09 07:12:10 UTC (rev 10165)
+++ branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
2012-10-09 07:54:03 UTC (rev 10166)
@@ -27,6 +27,7 @@
* @subpackage logistic
* @version $Id$
*/
+
phpgw::import_class('phpgwapi.uicommon');
phpgw::import_class('logistic.soactivity');
@@ -60,6 +61,7 @@
{
return $this->query();
}
+
self::add_javascript('phpgwapi', 'yahoo',
'datatable.js');
phpgwapi_yui::load_widget('datatable');
phpgwapi_yui::load_widget('paginator');
@@ -189,28 +191,26 @@
$data['datatable']['actions'][] = array
(
- 'my_name' =>
'new_booking',
- 'text' =>
lang('t_new_booking'),
+ 'my_name' =>
'new_allocation',
+ 'text' =>
lang('t_new_allocation'),
'action' =>
$GLOBALS['phpgw']->link('/index.php',array
(
- 'menuaction' =>
'logistic.uibooking.edit'
+ 'menuaction' =>
'logistic.uiallocation.edit'
)),
'parameters' =>
json_encode($parameters)
);
$data['datatable']['actions'][] = array
(
- 'my_name' =>
'view_bookings',
- 'text' =>
lang('t_view_bookings'),
+ 'my_name' =>
'view_allocations',
+ 'text' =>
lang('t_view_allocations'),
'action' =>
$GLOBALS['phpgw']->link('/index.php',array
(
- 'menuaction' =>
'logistic.uibooking.index'
+ 'menuaction' =>
'logistic.uiallocation.index'
)),
'parameters' =>
json_encode($parameters)
);
-
-
self::render_template_xsl(array('datatable_common'),
$data);
}
@@ -341,6 +341,10 @@
$activity->set_update_user( $user_id );
$activity->set_responsible_user_id(
phpgw::get_var('responsible_user_id') );
$activity->set_description(
phpgw::get_var('description') );
+
+ if( $activity->get_id() == '' |
$activity->get_id() == 0){
+ $activity->set_create_user( $user_id );
+ }
if(phpgw::get_var('start_date','string') != '')
{
@@ -469,4 +473,4 @@
return $user_array;
}
- }
+ }
\ No newline at end of file
Copied: branches/Version-1_0-branch/logistic/inc/class.uiallocation.inc.php
(from rev 10165, trunk/logistic/inc/class.uiallocation.inc.php)
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uiallocation.inc.php
(rev 0)
+++ branches/Version-1_0-branch/logistic/inc/class.uiallocation.inc.php
2012-10-09 07:54:03 UTC (rev 10166)
@@ -0,0 +1,329 @@
+<?php
+
+ /**
+ * phpGroupWare - logistic: a part of a Facilities Management System.
+ *
+ * @author Erik Holm-Larsen <address@hidden>
+ * @copyright Copyright (C) 2011,2012 Free Software Foundation, Inc.
http://www.fsf.org/
+ * This file is part of phpGroupWare.
+ *
+ * phpGroupWare is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * phpGroupWare is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with phpGroupWare; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
+ *
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @internal Development of this application was funded by
http://www.bergen.kommune.no/
+ * @package property
+ * @subpackage logistic
+ * @version $Id: class.uiactivity.inc.php 10101 2012-10-03 09:46:51Z
vator $
+ */
+ phpgw::import_class('phpgwapi.uicommon');
+
+
+ class logistic_uiallocation extends phpgwapi_uicommon
+ {
+
+ var $cat_id;
+ var $start;
+ var $query;
+ var $sort;
+ var $order;
+ var $filter;
+ var $type_id;
+ var $location_code;
+
+ private $bo;
+ private $bocommon;
+
+ private $so;
+ public $public_functions = array(
+ 'query' => true,
+ 'add' => true,
+ 'edit' => true,
+ 'view' => true,
+ 'index' => true
+ );
+
+ public function __construct()
+ {
+ parent::__construct();
+
+ $this->bo =
CreateObject('property.bolocation',true);
+ $this->bocommon = &
$this->bo->bocommon;
+ $this->so_control =
CreateObject('controller.socontrol');
+
+ $this->type_id =
$this->bo->type_id;
+
+ $this->start =
$this->bo->start;
+ $this->query =
$this->bo->query;
+ $this->sort =
$this->bo->sort;
+ $this->order =
$this->bo->order;
+ $this->filter =
$this->bo->filter;
+ $this->cat_id =
$this->bo->cat_id;
+ $this->part_of_town_id =
$this->bo->part_of_town_id;
+ $this->district_id =
$this->bo->district_id;
+ $this->status =
$this->bo->status;
+ $this->allrows =
$this->bo->allrows;
+ $this->lookup =
$this->bo->lookup;
+ $this->location_code =
$this->bo->location_code;
+
+ $GLOBALS['phpgw_info']['flags']['menu_selection'] =
"logistic::project::allocation";
+ }
+
+ public function index()
+ {
+ if (phpgw::get_var('phpgw_return_as') == 'json')
+ {
+ return $this->query();
+ }
+ self::add_javascript('phpgwapi', 'yahoo',
'datatable.js');
+ phpgwapi_yui::load_widget('datatable');
+ phpgwapi_yui::load_widget('paginator');
+
+ $user_array = $this->get_user_array();
+
+ $data = array(
+ 'datatable_name' => lang('allocation'),
+ 'form' => array(
+ 'toolbar' => array(
+ 'item' => array(
+ array('type' =>
'filter',
+ 'name' =>
'project',
+ 'text' =>
lang('Project') . ':',
+ 'list' =>
$project_array,
+ ),
+ array('type' =>
'filter',
+ 'name' =>
'user',
+ 'text' =>
lang('Responsible user') . ':',
+ 'list' =>
$user_array,
+ ),
+ array('type' => 'text',
+ 'text' =>
lang('search'),
+ 'name' =>
'query'
+ ),
+ array(
+ 'type' =>
'submit',
+ 'name' =>
'search',
+ 'value' =>
lang('Search')
+ ),
+ ),
+ ),
+ ),
+ 'datatable' => array(
+ 'source' =>
self::link(array('menuaction' => 'logistic.uiallocation.index',
'phpgw_return_as' => 'json')),
+ 'field' => array(
+ array(
+ 'key' => 'id',
+ 'label' => lang('ID'),
+ 'sortable' => true,
+ ),
+ array(
+ 'key' =>
'location_code',
+ 'label' =>
lang('Location code'),
+ 'sortable' => true
+ ),
+ array(
+ 'key' => 'address',
+ 'label' =>
lang('Address'),
+ 'sortable' => false
+ )
+ )
+ ),
+ );
+
+ self::render_template_xsl(array('datatable_common'),
$data);
+ }
+
+ public function query()
+ {
+ $params = array(
+ 'start' => phpgw::get_var('startIndex', 'int',
'REQUEST', 0),
+ 'query' => phpgw::get_var('query'),
+ 'sort' => phpgw::get_var('sort'),
+ 'dir' => phpgw::get_var('dir'),
+ 'filters' => $filters
+ );
+
+ $entity_id = phpgw::get_var('entity_id',
'int');
+ $cat_id =
phpgw::get_var('cat_id', 'int');
+ $district_id = phpgw::get_var('district_id',
'int');
+ $part_of_town_id =
phpgw::get_var('part_of_town_id', 'int');
+ $control_id =
phpgw::get_var('control_id', 'int');
+ $results =
phpgw::get_var('results', 'int');
+
+/*
+ if(!$entity_id && !$cat_id)
+ {
+ $values = array();
+ }
+ else
+ {
+ */
+ $entity_id = 3;
+ $cat_id = 1;
+ $location_id =
2295;//$GLOBALS['phpgw']->locations->get_id('property',
".entity.{$entity_id}.{$cat_id}");
+ //$boentity =
CreateObject('property.boentity',false, 'entity');
+ $boentity =
CreateObject('property.boentity',false, 'entity', $entity_id, $cat_id);
+ $boentity->results = $results;
+ //$values =
$boentity->read(array('control_registered' => $control_registered, 'control_id'
=> $control_id));
+ $values = $boentity->read();
+ //}
+
+ foreach($values as &$entry)
+ {
+ $checked = '';
+
if($this->so_control->check_control_component($control_id,$location_id,$entry['id']))
+ {
+ $checked = 'checked = "checked"
disabled = "disabled"';
+ $entry['delete'] = "<input class
=\"mychecks_delete\" type =\"checkbox\" name=\"values[delete][]\"
value=\"{$control_id}_{$location_id}_{$entry['id']}\">";
+ }
+ $entry['select'] = "<input class
=\"mychecks_add\" type =\"checkbox\" $checked
name=\"values[register_component][]\"
value=\"{$control_id}_{$location_id}_{$entry['id']}\">";
+ }
+
+ $results = $results ? $results :
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+
+ $result_data = array('results' => $values);
+
+ $result_data['total_records'] =
$boentity->total_records;
+ $result_data['start'] = $params['start'];
+ $result_data['sort'] = $params['sort'];
+ $result_data['dir'] = $params['dir'];
+
+ return $this->yui_results($result_data);
+ }
+
+ public function add()
+ {
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uiallocation.edit'));
+ }
+
+ public function edit()
+ {
+ $activity_id = phpgw::get_var('activity_id');
+ $allocation_id = phpgw::get_var('id');
+
+ if ($activity_id && is_numeric($activity_id))
+ {
+ $activity = $this->so->get_single($activity_id);
+ }
+
+ if (isset($_POST['save_allocation']))
+ {
+ $allocation = new
logistic_requirement_resource_allocation();
+ $allocation->set_id(phpgw::get_var('id'));
+
$allocation->set_requirement_id(phpgw::get_var('requirement_id'));
+
$allocation->set_article_id(phpgw::get_var('article_id'));
+ $allocation->set_type(phpgw::get_var('type'));
+
+ $allocation_id = $this->so->store($allocation);
+
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uiallocation.view', 'id' => $allocation_id));
+ }
+ else if (isset($_POST['cancel_allocation']))
+ {
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uiallocation.view', 'id' => $requirement_id));
+ }
+ else
+ {
+ $accounts =
$GLOBALS['phpgw']->acl->get_user_list_right(PHPGW_ACL_READ, 'run', 'logistic');
+
+ $entity_list =
execMethod('property.soadmin_entity.read', array('allrows' => true));
+
+ $data = array
+ (
+ 'editable' => true,
+ 'entity_list' => $entity_list
+ );
+
+ if($activity_id > 0)
+ {
+ $data['activity'] = $activity;
+ }
+
+
$GLOBALS['phpgw']->jqcal->add_listener('start_date');
+
$GLOBALS['phpgw']->jqcal->add_listener('end_date');
+
+ self::add_javascript('logistic', 'logistic',
'bim_type_requirement.js');
+
self::render_template_xsl(array('requirement/requirement'), $data);
+ }
+ }
+
+ function convert_to_array($object_list)
+ {
+ $converted_array = array();
+
+ foreach($object_list as $object)
+ {
+ $converted_array[] = $object->toArray();
+ }
+
+ return $converted_array;
+ }
+
+ public function view()
+ {
+ $activity_id = phpgw::get_var('id');
+ $project_id = phpgw::get_var('project_id');
+ if (isset($_POST['edit_activity']))
+ {
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uiactivity.edit', 'id' => $activity_id,
'project_id' => $project_id));
+ }
+ else if (isset($_POST['new_activity']))
+ {
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uiactivity.edit', 'project_id' => $project_id));
+ }
+ else
+ {
+ if ($activity_id && is_numeric($activity_id))
+ {
+ $activity =
$this->so->get_single($activity_id);
+ }
+
+ $activity_array = $activity->toArray();
+
+ if ($this->flash_msgs)
+ {
+ $msgbox_data =
$GLOBALS['phpgw']->common->msgbox_data($this->flash_msgs);
+ $msgbox_data =
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
+ }
+
+ $activity->set_project_id($project_id);
+
+ $data = array
+ (
+ 'activity' =>
$activity->toArray(),
+ 'img_go_home' =>
'rental/templates/base/images/32x32/actions/go-home.png',
+ 'dateformat'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']
+ );
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('logistic') . '::' . lang('Project');
+
self::render_template_xsl(array('activity_item'), $data);
+ }
+ }
+
+ private function get_user_array()
+ {
+ $user_array = array();
+ $user_array[] = array(
+ 'id' => '',
+ 'name' => lang('all_types')
+ );
+ $user_array[] = array(
+ 'id' =>
$GLOBALS['phpgw_info']['user']['account_id'],
+ 'name' => lang('my_activities'),
+ 'selected' => 1
+ );
+
+ return $user_array;
+ }
+ }
Copied:
branches/Version-1_0-branch/logistic/inc/class.uibim_type_requirement.inc.php
(from rev 10165, trunk/logistic/inc/class.uibim_type_requirement.inc.php)
===================================================================
---
branches/Version-1_0-branch/logistic/inc/class.uibim_type_requirement.inc.php
(rev 0)
+++
branches/Version-1_0-branch/logistic/inc/class.uibim_type_requirement.inc.php
2012-10-09 07:54:03 UTC (rev 10166)
@@ -0,0 +1,384 @@
+<?php
+
+ /**
+ * phpGroupWare - logistic: a part of a Facilities Management System.
+ *
+ * @author Erik Holm-Larsen <address@hidden>
+ * @copyright Copyright (C) 2011,2012 Free Software Foundation, Inc.
http://www.fsf.org/
+ * This file is part of phpGroupWare.
+ *
+ * phpGroupWare is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * phpGroupWare is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with phpGroupWare; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
+ *
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @internal Development of this application was funded by
http://www.bergen.kommune.no/
+ * @package property
+ * @subpackage logistic
+ * @version $Id$
+ */
+
+ phpgw::import_class('phpgwapi.jquery');
+ phpgw::import_class('phpgwapi.uicommon');
+ phpgw::import_class('logistic.soproject');
+
+ include_class('logistic', 'project');
+
+ class logistic_uibim_type_requirement extends phpgwapi_uicommon
+ {
+
+ private $so;
+ private $so_project;
+ public $public_functions = array(
+
+ 'query' => true,
+ 'index' => true,
+ 'edit' => true,
+ 'add' => true,
+ 'view' => true,
+ 'get_bim_level1' => true,
+ 'get_bim_level2' => true
+ );
+
+ public function __construct()
+ {
+ parent::__construct();
+
+ $this->so =
CreateObject('logistic.sobim_type_requirement');
+ $this->so_project = CreateObject('logistic.soproject');
+
+ $read = $GLOBALS['phpgw']->acl->check('.project',
PHPGW_ACL_READ, 'logistic');//1
+ $add = $GLOBALS['phpgw']->acl->check('.project',
PHPGW_ACL_ADD, 'logistic');//2
+ $edit = $GLOBALS['phpgw']->acl->check('.project',
PHPGW_ACL_EDIT, 'logistic');//4
+ $delete = $GLOBALS['phpgw']->acl->check('.project',
PHPGW_ACL_DELETE, 'logistic');//8
+
+ $manage = $GLOBALS['phpgw']->acl->check('.project',
16, 'logistic');//16
+
+ $GLOBALS['phpgw_info']['flags']['menu_selection'] =
"admin::logistic::bim_type_requirement";
+ }
+
+ public function query()
+ {
+ $params = array(
+ 'start' => phpgw::get_var('startIndex', 'int',
'REQUEST', 0),
+ 'results' => phpgw::get_var('results', 'int',
'REQUEST', null),
+ 'query' => phpgw::get_var('query'),
+ 'sort' => phpgw::get_var('sort'),
+ 'dir' => phpgw::get_var('dir'),
+ 'filters' => $filters
+ );
+
+ if
($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
+ {
+ $user_rows_per_page =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+ }
+ else
+ {
+ $user_rows_per_page = 10;
+ }
+ // YUI variables for paging and sorting
+ $start_index = phpgw::get_var('startIndex', 'int');
+ $num_of_objects = phpgw::get_var('results', 'int',
'GET', $user_rows_per_page);
+ $sort_field = phpgw::get_var('sort');
+ $sort_ascending = phpgw::get_var('dir') == 'desc' ?
false : true;
+ // Form variables
+ $search_for = phpgw::get_var('query');
+ $search_type = phpgw::get_var('search_option');
+ // Create an empty result set
+ $result_objects = array();
+ $result_count = 0;
+
+ $exp_param = phpgw::get_var('export');
+ $export = false;
+ if (isset($exp_param))
+ {
+ $export = true;
+ $num_of_objects = null;
+ }
+
+ //Retrieve the type of query and perform type specific
logic
+ $query_type = phpgw::get_var('type');
+ //var_dump($query_type);
+ switch ($query_type)
+ {
+ default: // ... all composites, filters (active
and vacant)
+ $result_objects =
$this->so->get($start_index, $num_of_objects, $sort_field, $sort_ascending,
$search_for, $search_type, $filters);
+ $object_count =
$this->so->get_count($search_for, $search_type, $filters);
+ break;
+ }
+ //var_dump($result_objects);
+ //Create an empty row set
+ $rows = array();
+ foreach ($result_objects as $result)
+ {
+ if (isset($result))
+ {
+ $rows[] = $result->serialize();
+ }
+ }
+
+ // ... add result data
+ $result_data = array('results' => $rows);
+
+ $result_data['total_records'] = $object_count;
+ $result_data['start'] = $params['start'];
+ $result_data['sort'] = $params['sort'];
+ $result_data['dir'] = $params['dir'];
+
+ $editable = phpgw::get_var('editable') == 'true' ? true
: false;
+
+ if (!$export)
+ {
+ //Add action column to each row in result table
+ array_walk(
+
$result_data['results'], array($this, '_add_links'),
"logistic.uibim_type_requirement.view");
+ }
+ return $this->yui_results($result_data);
+ }
+
+ public function index()
+ {
+ if (phpgw::get_var('phpgw_return_as') == 'json')
+ {
+ return $this->query();
+ }
+
+ self::add_javascript('phpgwapi', 'yahoo',
'datatable.js');
+ phpgwapi_yui::load_widget('datatable');
+ phpgwapi_yui::load_widget('paginator');
+
+ $entity_list =
execMethod('property.soadmin_entity.read', array('allrows' => true));
+
+ $data = array(
+ 'datatable_name' =>
lang('bim_type_requirement'),
+ 'form' => array(
+ 'toolbar' => array(
+ 'item' => array(
+ array('type' =>
'filter',
+ 'name' =>
'entity_type',
+ 'text' =>
lang('Entity types') . ':',
+ 'list' =>
$entity_list,
+ ),
+ array('type' => 'text',
+ 'text' =>
lang('search'),
+ 'name' =>
'query'
+ ),
+ array(
+ 'type' =>
'submit',
+ 'name' =>
'search',
+ 'value' =>
lang('Search')
+ ),
+ array(
+ 'type' =>
'link',
+ 'value' =>
lang('t_new_type_requirement'),
+ 'href' =>
self::link(array('menuaction' => 'logistic.uibim_type_requirement.add')),
+ 'class' =>
'new_item'
+ ),
+ ),
+ ),
+ ),
+ 'datatable' => array(
+ 'source' =>
self::link(array('menuaction' => 'logistic.uibim_type_requirement.index',
'phpgw_return_as' => 'json')),
+ 'field' => array(
+ array(
+ 'key' => 'id',
+ 'label' => lang('ID'),
+ 'sortable' => true,
+ 'formatter' =>
'YAHOO.portico.formatLink'
+ ),
+ array(
+ 'key' => 'entity_label',
+ 'label' =>
lang('Entity'),
+ 'sortable' => true
+ ),
+ array(
+ 'key' =>
'category_label',
+ 'label' =>
lang('Category'),
+ 'sortable' => true
+ ),
+ array(
+ 'key' =>
'project_type_label',
+ 'label' =>
lang('Project_type'),
+ 'sortable' => true
+ ),
+ array(
+ 'key' => 'link',
+ 'hidden' => true
+ )
+ )
+ ),
+ );
+
+ self::render_template_xsl('datatable_common', $data);
+ }
+
+ public function add()
+ {
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uibim_type_requirement.edit'));
+ }
+
+ public function edit()
+ {
+ $entity_so =
CreateObject('property.soadmin_entity');
+ $custom = createObject('phpgwapi.custom_fields');
+ $req_type_id = phpgw::get_var('id');
+ if($req_type_id && is_numeric($req_type_id))
+ {
+ $req_type = $this->so->get_single($req_type_id);
+ }
+ else
+ {
+ $req_type = new
logistic_bim_item_type_requirement();
+ }
+
+ if (isset($_POST['save']))
+ {
+
$req_type->set_entity_id(phpgw::get_var('entity_id'));
+
$req_type->set_category_id(phpgw::get_var('category_id'));
+
$req_type->set_project_type_id(phpgw::get_var('project_type_id'));
+ $cust_attr_ids = phpgw::get_var('attributes');
+ $req_type->set_cust_attribute_id(implode(',',
$cust_attr_ids));
+
+ $req_type_id = $this->so->store($req_type);
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uibim_type_requirement.view', 'id' =>
$req_type_id));
+ }
+ else if (isset($_POST['cancel']))
+ {
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uibim_type_requirement.view', 'id' =>
$req_type_id));
+ }
+ else
+ {
+ $entity_list =
execMethod('property.soadmin_entity.read', array('allrows' => true));
+
+ array_unshift($entity_list,array
('id'=>'','name'=> lang('select value')));
+ if($req_type->get_entity_id())
+ {
+ foreach ($entity_list as &$e)
+ {
+ if($e['id'] ==
$req_type->get_entity_id())
+ {
+ $e['selected'] = 1;
+ }
+ }
+ $category_list =
$entity_so->read_category(array('allrows'=>true,'entity_id'=>$req_type->get_entity_id()));
+ foreach ($category_list as &$c)
+ {
+ if($c['id'] ==
$req_type->get_category_id())
+ {
+ $c['selected'] = 1;
+ }
+ }
+
+ $attributes =
$custom->find('property',".entity.{$req_type->get_entity_id()}.{$req_type->get_category_id()}",
0, '','','',true, true);
+ $selected_attributes = explode(',',
$req_type->get_cust_attribute_id());
+ foreach ($attributes as &$a)
+ {
+ if(in_array($a['id'],
$selected_attributes))
+ {
+ $a['checked'] =
'checked';
+ }
+ }
+ }
+ $project_type_array =
$this->so_project->get_project_types($req_type->get_project_type_id());
+
+ $data = array
+ (
+ 'value_id' => !empty($req_type)
? $req_type->get_id() : 0,
+ 'img_go_home' =>
'rental/templates/base/images/32x32/actions/go-home.png',
+ 'entities' => $entity_list,
+ 'categories' => $category_list,
+ 'attributes' => $attributes,
+ 'project_types' =>
$project_type_array,
+ 'editable' => true,
+ 'req_type' => $req_type
+ );
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('logistic') . '::' . lang('Project type');
+
+ phpgwapi_jquery::load_widget('core');
+
+ self::add_javascript('logistic', 'logistic',
'bim_type_requirement.js');
+
self::render_template_xsl(array('bim_type_requirement_item'), $data);
+ }
+ }
+
+ public function get_bim_level1()
+ {
+ $entity_id = phpgw::get_var('entity_id');
+ $entity =
CreateObject('property.soadmin_entity');
+
+ $category_list =
$entity->read_category(array('allrows'=>true,'entity_id'=>$entity_id));
+
+ return $category_list;
+ }
+
+ public function get_bim_level2()
+ {
+ $custom = createObject('phpgwapi.custom_fields');
+ $entity_id = phpgw::get_var('entity_id');
+ $cat_id = phpgw::get_var('cat_id');
+
+ $attrib_data =
$custom->find('property',".entity.{$entity_id}.{$cat_id}", 0, '','','',true,
true);
+
+ return $attrib_data;
+ }
+
+ public function view()
+ {
+ $entity_so =
CreateObject('property.soadmin_entity');
+ $custom = createObject('phpgwapi.custom_fields');
+ $req_type_id = phpgw::get_var('id');
+ if(isset($_POST['edit']))
+ {
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uibim_type_requirement.edit', 'id' =>
$req_type_id));
+ }
+
+ if($req_type_id && is_numeric($req_type_id))
+ {
+ $req_type = $this->so->get_single($req_type_id);
+ $entity =
$entity_so->read_single($req_type->get_entity_id());
+ $category =
$entity_so->read_single_category($req_type->get_entity_id(),$req_type->get_category_id());
+ $all_attributes =
$custom->find('property',".entity.{$req_type->get_entity_id()}.{$req_type->get_category_id()}",
0, '','','',true, true);
+ $attributes = array();
+ $selected_attributes = explode(',',
$req_type->get_cust_attribute_id());
+ foreach ($all_attributes as $attr)
+ {
+ if(in_array($attr['id'],
$selected_attributes))
+ {
+ $attributes[] = $attr;
+ }
+ }
+
+ $objects = $this->so_project->get(null, null,
null, null, null, 'project_type', array('id' =>
$req_type->get_project_type_id()));
+ if (count($objects) > 0)
+ {
+ $keys = array_keys($objects);
+ $project_type = $objects[$keys[0]];
+ }
+
+ $data = array
+ (
+ 'value_id' => !empty($req_type)
? $req_type->get_id() : 0,
+ 'img_go_home' =>
'rental/templates/base/images/32x32/actions/go-home.png',
+ 'req_type' => $req_type,
+ 'entity' => $entity,
+ 'category' => $category,
+ 'attributes' => $attributes,
+ 'project_type' => $project_type
+ );
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('logistic') . '::' . lang('Project type');
+
self::render_template_xsl(array('bim_type_requirement_item'), $data);
+ }
+ }
+ }
Deleted: branches/Version-1_0-branch/logistic/inc/class.uibooking.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uibooking.inc.php
2012-10-09 07:12:10 UTC (rev 10165)
+++ branches/Version-1_0-branch/logistic/inc/class.uibooking.inc.php
2012-10-09 07:54:03 UTC (rev 10166)
@@ -1,434 +0,0 @@
-<?php
- /**
- * phpGroupWare - controller: a part of a Facilities Management System.
- *
- * @author Erink Holm-Larsen <address@hidden>
- * @author Torstein Vadla <address@hidden>
- * @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C) 2011,2012 Free Software Foundation, Inc.
http://www.fsf.org/
- * This file is part of phpGroupWare.
- *
- * phpGroupWare is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * phpGroupWare is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with phpGroupWare; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
- *
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @internal Development of this application was funded by
http://www.bergen.kommune.no/
- * @package property
- * @subpackage controller
- * @version $Id: class.uicheck_list.inc.php 8628 2012-01-21 10:42:05Z
vator $
- */
-
- phpgw::import_class('phpgwapi.yui');
-
- /**
- * Import the jQuery class
- */
- phpgw::import_class('phpgwapi.jquery');
-
- phpgw::import_class('phpgwapi.uicommon');
-
- class controller_uicontrol_register_to_component extends
phpgwapi_uicommon
- {
- var $cat_id;
- var $start;
- var $query;
- var $sort;
- var $order;
- var $filter;
- var $type_id;
- var $location_code;
-
- private $bo;
- private $bocommon;
- private $so_control;
-
- var $public_functions = array
- (
- 'index'
=> true,
- 'query'
=> true,
- 'edit_component'
=> true,
- 'get_location_category' => true,
- 'get_district_part_of_town' => true,
- 'get_category_by_entity' => true,
- 'get_entity_table_def' => true,
- 'get_locations'
=> true,
- 'get_location_type_category' => true
- );
-
- function __construct()
- {
- parent::__construct();
-
- $this->bo =
CreateObject('property.bolocation',true);
- $this->bocommon = &
$this->bo->bocommon;
- $this->so_control =
CreateObject('controller.socontrol');
-
- $this->type_id =
$this->bo->type_id;
-
- $this->start =
$this->bo->start;
- $this->query =
$this->bo->query;
- $this->sort =
$this->bo->sort;
- $this->order =
$this->bo->order;
- $this->filter =
$this->bo->filter;
- $this->cat_id =
$this->bo->cat_id;
- $this->part_of_town_id =
$this->bo->part_of_town_id;
- $this->district_id =
$this->bo->district_id;
- $this->status =
$this->bo->status;
- $this->allrows =
$this->bo->allrows;
- $this->lookup =
$this->bo->lookup;
- $this->location_code =
$this->bo->location_code;
-
-
self::set_active_menu('controller::control::location_for_check_list');
- }
-
-
-
- function index()
- {
-
self::set_active_menu('controller::control::component_for_check_list');
- $GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
- $receipt = array();
-
- if(phpgw::get_var('phpgw_return_as') == 'json')
- {
- return $this->query();
- }
-
- $msgbox_data = array();
- if( phpgw::get_var('phpgw_return_as') != 'json' &&
$receipt = phpgwapi_cache::session_get('phpgwapi', 'phpgw_messages'))
- {
- phpgwapi_cache::session_clear('phpgwapi',
'phpgw_messages');
- $msgbox_data =
$GLOBALS['phpgw']->common->msgbox_data($receipt);
- $msgbox_data =
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
- }
-
- $myColumnDefs = array();
- $datavalues = array();
- $myButtons = array();
-
- $datavalues[] = array
- (
- 'name' => "0",
- 'values' =>
json_encode(array()),
- 'total_records' => 0,
- 'permission' => "''",
- 'is_paginator' => 1,
- 'edit_action' => "''",
- 'footer' => 0
- );
-
- $myColumnDefs[0] = array
- (
- 'name' => "0",
- 'values' => json_encode(array())
- );
-
- $GLOBALS['phpgw']->translation->add_app('property');
- $entity =
CreateObject('property.soadmin_entity');
- $entity_list = $entity->read(array('allrows' =>
true));
-
- $district_list =
$this->bocommon->select_district_list('filter',$this->district_id);
-
- $part_of_town_list =
execMethod('property.bogeneric.get_list', array('type'=>'part_of_town',
'selected' => $part_of_town_id ));
- $location_type_list =
execMethod('property.soadmin_location.select_location_type');
-
- array_unshift($entity_list ,array
('id'=>'','name'=>lang('select')));
- array_unshift($district_list ,array
('id'=>'','name'=>lang('select')));
- array_unshift($part_of_town_list ,array
('id'=>'','name'=>lang('select')));
- array_unshift($location_type_list ,array
('id'=>'','name'=>lang('select')));
-
- $cats = CreateObject('phpgwapi.categories', -1,
'controller', '.control');
- $cats->supress_info = true;
-
- $control_area =
$cats->formatted_xslt_list(array('format'=>'filter','globals' => true,'use_acl'
=> $this->_category_acl));
-
-
- $control_area_list = array();
- foreach($control_area['cat_list'] as $cat_list)
- {
- $control_area_list[] = array
- (
- 'id' => $cat_list['cat_id'],
- 'name' => $cat_list['name'],
- );
- }
-
- array_unshift ($control_area_list ,array
('id'=>'','name'=>lang('select')));
-
-
-
- $data = array
- (
- 'td_count'
=> '""',
- 'datatable'
=> $datavalues,
- 'myColumnDefs'
=> $myColumnDefs,
- 'myButtons'
=> $myButtons,
-
- 'msgbox_data'
=> $msgbox_data,
- 'control_area_list' =>
array('options' => $control_area_list),
- 'filter_form'
=> array
-
(
-
'control_area_list' =>
array('options' => $control_area_list),
-
'entity_list' =>
array('options' => $entity_list),
-
'district_list' =>
array('options' => $district_list),
-
'part_of_town_list' =>
array('options' => $part_of_town_list),
-
'location_type_list' => array('options' =>
$location_type_list),
-
),
- 'update_action'
=> self::link(array('menuaction' =>
'controller.uicontrol_location.edit_component'))
- );
-
- phpgwapi_jquery::load_widget('core');
- phpgwapi_jquery::load_widget('autocomplete');
-
- self::add_javascript('controller', 'controller',
'ajax_control_to_component.js');
- self::add_javascript('controller', 'yahoo',
'register_control_to_component2.js');
-
-
self::render_template_xsl(array('control_location/register_control_to_component'
), $data);
- }
-
-
- /*
- * Return categories based on chosen location
- */
- public function get_location_category()
- {
- $type_id = phpgw::get_var('type_id');
- $category_types =
$this->bocommon->select_category_list(array(
-
'format'=>'filter',
-
'selected' => 0,
-
'type'
=>'location',
-
'type_id'
=>$type_id,
-
'order'=>'descr'
-
));
- $default_value = array ('id'=>'','name'=>lang('no
category selected'));
- array_unshift($category_types,$default_value);
- return json_encode( $category_types );
- }
-
- /*
- * Return parts of town based on chosen district
- */
- public function get_district_part_of_town()
- {
- $district_id = phpgw::get_var('district_id');
- $part_of_town_list =
$this->bocommon->select_part_of_town('filter',null,$district_id);
- $default_value = array ('id'=>'','name'=>lang('no part
of town'));
- array_unshift($part_of_town_list,$default_value);
-
- return json_encode( $part_of_town_list );
- }
-
-
- /*
-
- * Return parts of town based on chosen district
- */
- public function get_category_by_entity()
- {
- $entity_id = phpgw::get_var('entity_id');
- $entity =
CreateObject('property.soadmin_entity');
-
- $category_list =
$entity->read_category(array('allrows'=>true,'entity_id'=>$entity_id));
-
- return $category_list;
- }
-
-
- public function get_location_type_category()
- {
- $location_type =
phpgw::get_var('location_type', 'int');
-
- $values = $this->bocommon->select_category_list(array
- (
- 'format'=>'filter',
- // 'selected' => $this->cat_id,
- 'type' =>'location',
- 'type_id' =>$location_type,
- 'order'=>'descr'
- )
- );
-
- return $values;
- }
-
-
- public function get_entity_table_def()
- {
- $entity_id =
phpgw::get_var('entity_id', 'int');
- $cat_id =
phpgw::get_var('cat_id', 'int');
- $boentity =
CreateObject('property.boentity',false, 'entity');
- $boentity->read(array('dry_run' => true));
- $uicols = $boentity->uicols;
- $columndef = array();
-
- $columndef[] = array
- (
- 'key' => 'select',
- 'label' => lang('select'),
- 'sortable' => false,
- 'formatter' => false,
- 'hidden' => false,
- 'formatter' => '',
- 'className' => ''
- );
-
- $columndef[] = array
- (
- 'key' => 'delete',
- 'label' => lang('delete'),
- 'sortable' => false,
- 'formatter' => false,
- 'hidden' => false,
- 'formatter' => '',
- 'className' => ''
- );
-
- $count_fields = count($uicols['name']);
-
- for ($i=0;$i<$count_fields;$i++)
- {
- if( $uicols['name'][$i])
- {
- $columndef[] = array
- (
- 'key' =>
$uicols['name'][$i],
- 'label' =>
$uicols['descr'][$i],
- 'sortable' =>
$uicols['sortable'][$i],
- 'formatter' =>
$uicols['formatter'][$i],
- 'hidden' =>
$uicols['input_type'][$i] == 'hidden' ? true : false ,
- 'className' =>
$uicols['classname'][$i],
- );
- }
- }
-
-//_debug_array($columndef);
- return $columndef;
- }
-
-
- public function get_locations()
- {
- $location_code = phpgw::get_var('location_code');
- $child_level = phpgw::get_var('child_level', 'int',
'REQUEST', 1);
- $part_of_town_id = phpgw::get_var('part_of_town_id',
'int');
-
- $criteria = array
- (
- 'location_code' => $location_code,
- 'child_level' => $child_level,
- 'field_name' =>
"loc{$child_level}_name",
- 'part_of_town_id' => $part_of_town_id
- );
-
- $locations =
execMethod('property.solocation.get_children',$criteria);
- return $locations;
- }
-
-
-
- public function query()
- {
- $entity_id =
phpgw::get_var('entity_id', 'int');
- $cat_id =
phpgw::get_var('cat_id', 'int');
- $district_id = phpgw::get_var('district_id',
'int');
- $part_of_town_id =
phpgw::get_var('part_of_town_id', 'int');
- $control_id =
phpgw::get_var('control_id', 'int');
- $results =
phpgw::get_var('results', 'int');
- $control_registered =
phpgw::get_var('control_registered', 'bool');
-
- if(!$entity_id && !$cat_id)
- {
- $values = array();
- }
- else
- {
- $location_id =
$GLOBALS['phpgw']->locations->get_id('property',
".entity.{$entity_id}.{$cat_id}");
- $boentity =
CreateObject('property.boentity',false, 'entity');
- $boentity->results = $results;
- $values =
$boentity->read(array('control_registered' => $control_registered, 'control_id'
=> $control_id));
- }
-
- foreach($values as &$entry)
- {
- $checked = '';
-
if($this->so_control->check_control_component($control_id,$location_id,$entry['id']))
- {
- $checked = 'checked = "checked"
disabled = "disabled"';
- $entry['delete'] = "<input class
=\"mychecks_delete\" type =\"checkbox\" name=\"values[delete][]\"
value=\"{$control_id}_{$location_id}_{$entry['id']}\">";
- }
- $entry['select'] = "<input class
=\"mychecks_add\" type =\"checkbox\" $checked
name=\"values[register_component][]\"
value=\"{$control_id}_{$location_id}_{$entry['id']}\">";
- }
-
-
- $results = $results ? $results :
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
- $return_data['recordsReturned'] = count($values);
- $return_data['totalRecords'] = $boentity->total_records;
- $return_data['startIndex'] = $this->start;
- $return_data['sort'] = 'location_code';
- $return_data['dir'] = "ASC";
- $return_data['pageSize'] = $results;
- $return_data['activePage'] = floor($this->start /
$results) + 1;
- $return_data['records'] = $values;
-
- return $return_data;
- }
-
- public function edit_component()
- {
- if($values = phpgw::get_var('values'))
- {
- if(!$GLOBALS['phpgw']->acl->check('.admin',
PHPGW_ACL_EDIT, 'property'))
- {
- $receipt['error'][]=true;
- phpgwapi_cache::message_set(lang('you
are not approved for this task'), 'error');
- }
- if(!$receipt['error'])
- {
-
-
if($this->so_control->register_control_to_component($values))
- {
- $result = array
- (
- 'status' =>
'updated'
- );
- }
- else
- {
- $result = array
- (
- 'status' =>
'error'
- );
- }
- }
- }
-
- if(phpgw::get_var('phpgw_return_as') == 'json')
- {
- if( $receipt =
phpgwapi_cache::session_get('phpgwapi', 'phpgw_messages'))
- {
-
phpgwapi_cache::session_clear('phpgwapi', 'phpgw_messages');
- $result['receipt'] = $receipt;
- }
- else
- {
- $result['receipt'] = array();
- }
- return $result;
- }
- else
- {
- $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' =>
'controller.uicontrol_location.register_control_to_component'));
- }
- }
- }
Modified: branches/Version-1_0-branch/logistic/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uiproject.inc.php
2012-10-09 07:12:10 UTC (rev 10165)
+++ branches/Version-1_0-branch/logistic/inc/class.uiproject.inc.php
2012-10-09 07:54:03 UTC (rev 10166)
@@ -54,6 +54,13 @@
$this->so = CreateObject('logistic.soproject');
+ $read = $GLOBALS['phpgw']->acl->check('.project',
PHPGW_ACL_READ, 'logistic');//1
+ $add = $GLOBALS['phpgw']->acl->check('.project',
PHPGW_ACL_ADD, 'logistic');//2
+ $edit = $GLOBALS['phpgw']->acl->check('.project',
PHPGW_ACL_EDIT, 'logistic');//4
+ $delete = $GLOBALS['phpgw']->acl->check('.project',
PHPGW_ACL_DELETE, 'logistic');//8
+
+ $manage = $GLOBALS['phpgw']->acl->check('.project',
16, 'logistic');//16
+
$GLOBALS['phpgw_info']['flags']['menu_selection'] =
"logistic::project";
}
@@ -88,7 +95,7 @@
$result_objects = array();
$result_count = 0;
- //Retrieve a contract identifier and load corresponding
contract
+ //Retrieve a project identifier and load corresponding
project
$project_id = phpgw::get_var('project_id');
$exp_param = phpgw::get_var('export');
@@ -117,7 +124,7 @@
$object_count =
$this->so->get_count($search_for, $search_type, $filters);
break;
}
-
+ //var_dump($result_objects);
//Create an empty row set
$rows = array();
foreach ($result_objects as $result)
@@ -161,7 +168,7 @@
{
return $this->query();
}
-// self::add_javascript('logistic', 'yahoo',
'datatable.js');
+
self::add_javascript('phpgwapi', 'yahoo',
'datatable.js');
phpgwapi_yui::load_widget('datatable');
phpgwapi_yui::load_widget('paginator');
@@ -359,7 +366,7 @@
(
'value_id' => !empty($project) ?
$project->get_id() : 0,
'img_go_home' =>
'rental/templates/base/images/32x32/actions/go-home.png',
- 'project' => $project_array,
+ 'project' => $project,
'view' => 'view_project'
);
@@ -394,7 +401,7 @@
(
'value_id' => !empty($project) ?
$project->get_id() : 0,
'img_go_home' =>
'rental/templates/base/images/32x32/actions/go-home.png',
- 'project' => $project_array
+ 'project' => $project
);
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('logistic') . '::' . lang('Project type');
Modified: branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
2012-10-09 07:12:10 UTC (rev 10165)
+++ branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
2012-10-09 07:54:03 UTC (rev 10166)
@@ -43,7 +43,8 @@
'index' => true,
'add' => true,
'edit' => true,
- 'view' => true
+ 'view' => true,
+ 'test' => true
);
public function __construct()
@@ -135,7 +136,7 @@
{
//Add action column to each row in result table
array_walk(
-
$result_data['results'], array($this, '_add_links'), "logistic.uiproject.view");
+
$result_data['results'], array($this, '_add_links'),
"logistic.uirequirement.view");
}
return $this->yui_results($result_data);
}
@@ -172,17 +173,21 @@
'source' =>
self::link(array('menuaction' => 'logistic.uirequirement.index',
'phpgw_return_as' => 'json')),
'field' => array(
array(
- 'key' => 'name',
- 'label' =>
lang('Project name'),
- 'sortable' => true
- ),
- array(
'key' => 'id',
'label' => lang('ID'),
'sortable' => true,
- 'formatter' =>
'YAHOO.portico.formatLink'
+ ),
+ array(
+ 'key' => 'date_from',
+ 'label' => lang('From
date'),
+ 'sortable' => false
),
array(
+ 'key' => 'date_to',
+ 'label' => lang('To
date'),
+ 'sortable' => false
+ ),
+ array(
'key' => 'link',
'hidden' => true
)
@@ -208,11 +213,142 @@
'text' =>
lang('t_book_requirement'),
'action' =>
$GLOBALS['phpgw']->link('/index.php',array
(
- 'menuaction' =>
'logistic.uiactivity.edit'
+ 'menuaction' =>
'logistic.uiallocation.add'
)),
'parameters' =>
json_encode($parameters)
);
self::render_template_xsl('datatable_common', $data);
}
- }
\ No newline at end of file
+
+ public function view()
+ {
+ $requirement_id = phpgw::get_var('id');
+
+ if(isset($_POST['edit_requirement']))
+ {
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uirequirement.edit', 'id' => $requirement_id));
+ }
+ else
+ {
+ if ($requirement_id &&
is_numeric($requirement_id))
+ {
+ $requirement =
$this->so->get_single($requirement_id);
+ }
+
+ $requirement_array = $requirement->toArray();
+
+ if ($this->flash_msgs)
+ {
+ $msgbox_data =
$GLOBALS['phpgw']->common->msgbox_data($this->flash_msgs);
+ $msgbox_data =
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
+ }
+
+ $data = array
+ (
+ 'value_id' => !empty($requirement) ?
$requirement->get_id() : 0,
+ 'img_go_home' =>
'rental/templates/base/images/32x32/actions/go-home.png',
+ 'project' => $requirement_array,
+ 'view' => 'view_requirement'
+ );
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('logistic') . '::' . lang('Project') . '::' . lang('Requirement');
+
self::render_template_xsl(array('requirement_item'), $data);
+ }
+ }
+
+ public function add()
+ {
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uirequirement.edit'));
+ }
+
+ public function edit()
+ {
+ $activity_id = phpgw::get_var('activity_id');
+ $requirement_id = phpgw::get_var('id');
+
+ if ($activity_id && is_numeric($activity_id))
+ {
+ $activity = $this->so->get_single($activity_id);
+ }
+
+ if (isset($_POST['save_requirement']))
+ {
+ $requirement->set_id( phpgw::get_var('id') );
+ $requirement->set_resource_type_id(
phpgw::get_var('categories') );
+ $requirement->set_no_of_elements(
phpgw::get_var('no_of_elements') );
+
+ if(phpgw::get_var('start_date','string') != '')
+ {
+ $start_date_ts =
phpgwapi_datetime::date_to_timestamp( phpgw::get_var('start_date','string') );
+
$requirement->set_start_date($start_date_ts);
+ }
+ else
+ {
+ $requirement->set_start_date(0);
+ }
+
+ if( phpgw::get_var('end_date','string') != '')
+ {
+ $end_date_ts =
phpgwapi_datetime::date_to_timestamp( phpgw::get_var('end_date','string') );
+
$requirement->set_end_date($end_date_ts);
+ }
+ else
+ {
+ $requirement->set_end_date(0);
+ }
+
+ $requirement_id =
$this->so->store($requirement);
+
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uirequirement.view', 'id' => $requirement_id));
+ }
+ else if (isset($_POST['cancel_requirement']))
+ {
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uirequirement.view', 'id' => $requirement_id));
+ }
+ else
+ {
+ $accounts =
$GLOBALS['phpgw']->acl->get_user_list_right(PHPGW_ACL_READ, 'run', 'logistic');
+
+ $entity_list =
execMethod('property.soadmin_entity.read', array('allrows' => true));
+
+ $data = array
+ (
+ 'editable' => true,
+ 'entity_list' => $entity_list
+ );
+
+ if($activity_id > 0)
+ {
+ $data['activity'] = $activity;
+ }
+
+
$GLOBALS['phpgw']->jqcal->add_listener('start_date');
+
$GLOBALS['phpgw']->jqcal->add_listener('end_date');
+
+ self::add_javascript('logistic', 'logistic',
'bim_type_requirement.js');
+
self::render_template_xsl(array('requirement/requirement'), $data);
+ }
+ }
+
+ public function test()
+ {
+ $custom = createObject('phpgwapi.custom_fields');
+ $entity_list =
execMethod('property.soadmin_entity.read', array('allrows' => true));
+
+ _debug_array($entity_list);
+
+ foreach($entity_list as $entry)
+ {
+ $cat_list =
execMethod('property.soadmin_entity.read_category',(array('allrows'=>true,'entity_id'=>$entry['id'])));
+ _debug_array($cat_list);
+
+ foreach($cat_list as $cat)
+ {
+ $attrib_data =
$custom->find('property',".entity.{$cat['entity_id']}.{$cat[id]}", 0,
'','','',true, true);
+ _debug_array($attrib_data);
+ }
+
+ }
+ }
+ }
Modified: branches/Version-1_0-branch/logistic/inc/model/class.activity.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/model/class.activity.inc.php
2012-10-09 07:12:10 UTC (rev 10165)
+++ branches/Version-1_0-branch/logistic/inc/model/class.activity.inc.php
2012-10-09 07:54:03 UTC (rev 10166)
@@ -41,6 +41,8 @@
protected $start_date;
protected $end_date;
protected $responsible_user_id;
+ protected $create_user;
+ protected $create_date;
protected $update_user;
protected $update_date;
@@ -138,9 +140,9 @@
return $this->responsible_user_id;
}
- public function set_update_user($user_id)
+ public function set_update_user($update_user)
{
- $this->update_user = $user_id;
+ $this->update_user = $update_user;
}
public function get_update_user()
@@ -158,6 +160,26 @@
return $this->update_date;
}
+ public function set_create_user($create_user)
+ {
+ $this->create_user = $create_user;
+ }
+
+ public function get_create_user()
+ {
+ return $this->create_user;
+ }
+
+ public function set_create_date($create_date)
+ {
+ $this->create_date = $create_date;
+ }
+
+ public function get_create_date()
+ {
+ return $this->create_date;
+ }
+
public function
set_sub_activities($sub_activities)
{
$this->sub_activities = $sub_activities;
Modified:
branches/Version-1_0-branch/logistic/inc/model/class.bim_item_type_requirement.inc.php
===================================================================
---
branches/Version-1_0-branch/logistic/inc/model/class.bim_item_type_requirement.inc.php
2012-10-09 07:12:10 UTC (rev 10165)
+++
branches/Version-1_0-branch/logistic/inc/model/class.bim_item_type_requirement.inc.php
2012-10-09 07:54:03 UTC (rev 10166)
@@ -33,11 +33,11 @@
{
public static $so;
- protected static $id;
- protected static $location_id;
- protected static $project_type_id;
- protected static $attribute_name;
- protected static $attribute_type;
+ protected $id;
+ protected $entity_id;
+ protected $category_id;
+ protected $project_type_id;
+ protected $cust_attribute_id;
/**
* Constructor. Takes an optional ID. If a contract is
created from outside
@@ -60,44 +60,44 @@
return $this->id;
}
- public function set_location_id($location_id)
+ public function set_entity_id($entity_id)
{
- $this->location_id = $location_id;
+ $this->entity_id = $entity_id;
}
- public function get_location_id()
+ public function get_entity_id()
{
- return $this->location_id;
+ return $this->entity_id;
}
- public function set_project_type_id($project_type_id)
+ public function set_category_id($category_id)
{
- $this->project_type_id = $project_type_id;
+ $this->category_id = $category_id;
}
- public function get_project_type_id()
+ public function get_category_id()
{
- return $this->project_type_id;
+ return $this->category_id;
}
- public function set_attribute_name($attribute_name)
+ public function set_project_type_id($project_type_id)
{
- $this->attribute_name = $attribute_name;
+ $this->project_type_id = $project_type_id;
}
- public function get_attribute_name()
+ public function get_project_type_id()
{
- return $this->attribute_name;
+ return $this->project_type_id;
}
- public function set_attribute_type($attribute_type)
+ public function set_cust_attribute_id($cust_attribute_id)
{
- $this->attribute_type = $attribute_type;
+ $this->cust_attribute_id = $cust_attribute_id;
}
- public function get_attribute_type()
+ public function get_cust_attribute_id()
{
- return $this->attribute_type;
+ return $this->cust_attribute_id;
}
/**
@@ -108,9 +108,31 @@
public static function get_so()
{
if (self::$so == null) {
- self::$so =
CreateObject('logistic.sobim_item_type_requirement');
+ self::$so =
CreateObject('logistic.sobim_type_requirement');
}
return self::$so;
}
+
+ public function serialize()
+ {
+ $entity_so =
CreateObject('property.soadmin_entity');
+ $project_so = CreateObject('logistic.soproject');
+ $entity =
$entity_so->read_single($this->get_entity_id());
+ $category =
$entity_so->read_single_category($this->get_entity_id(),$this->get_category_id());
+ $entity_label = $entity['name'];
+ $category_label = $category['name'];
+ $project_type_label =
$project_so->get_project_type_label($this->get_project_type_id());
+
+ return array(
+ 'id' => $this->get_id(),
+ 'entity_id' => $this->get_entity_id(),
+ 'entity_label' => $entity_label,
+ 'category_id' => $this->get_category_id(),
+ 'category_label' => $category_label,
+ 'atributes' => $this->get_cust_attribute_id(),
+ 'project_type_id' =>
$this->get_project_type_id(),
+ 'project_type_label' => $project_type_label
+ );
+ }
}
\ No newline at end of file
Modified: branches/Version-1_0-branch/logistic/inc/model/class.project.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/model/class.project.inc.php
2012-10-09 07:12:10 UTC (rev 10165)
+++ branches/Version-1_0-branch/logistic/inc/model/class.project.inc.php
2012-10-09 07:54:03 UTC (rev 10166)
@@ -28,7 +28,7 @@
*/
include_class('logistic', 'model', '/inc/model/');
-
+
class logistic_project extends logistic_model
{
public static $so;
@@ -42,7 +42,7 @@
/**
* Constructor. Takes an optional ID. If a
contract is created from outside
* the database the ID should be empty so the
database can add one according to its logic.
- *
+ *
* @param int $id the id of this project
*/
public function __construct(int $id = null)
@@ -67,42 +67,42 @@
public function get_name()
{
- return $this->name;
+ return $this->name;
}
-
+
public function
set_project_type_id($project_type_id)
{
$this->project_type_id =
$project_type_id;
}
-
+
public function get_project_type_id()
{
return $this->project_type_id;
}
-
+
public function
set_project_type_label($project_type_label)
{
$this->project_type_label =
$project_type_label;
}
-
+
public function get_project_type_label()
{
return $this->project_type_label;
}
-
+
public function set_description($description)
{
$this->description = $description;
}
-
+
public function get_description()
{
return $this->description;
}
-
+
/**
* Get a static reference to the storage object
associated with this model object
- *
+ *
* @return the storage object
*/
public static function get_so()
Modified:
branches/Version-1_0-branch/logistic/inc/model/class.requirement_value.inc.php
===================================================================
---
branches/Version-1_0-branch/logistic/inc/model/class.requirement_value.inc.php
2012-10-09 07:12:10 UTC (rev 10165)
+++
branches/Version-1_0-branch/logistic/inc/model/class.requirement_value.inc.php
2012-10-09 07:54:03 UTC (rev 10166)
@@ -35,7 +35,9 @@
protected static $id;
protected static $requirement_id;
- protected static $bim_item_type_requirement_id;
+ protected $bim_type_requirement_id;
+ protected $location_id;
+ protected $cust_attribute_id;
protected static $value;
/**
@@ -69,16 +71,36 @@
return $this->requirement_id;
}
- public function
set_bim_item_type_requirement_id($bim_item_type_requirement_id)
+ public function
set_bim_type_requirement_id($bim_type_requirement_id)
{
- $this->bim_item_type_requirement_id =
$bim_item_type_requirement_id;
+ $this->bim_type_requirement_id =
$bim_type_requirement_id;
}
- public function get_bim_item_type_requirement_id()
+ public function get_bim_type_requirement_id()
{
- return $this->bim_item_type_requirement_id;
+ return $this->bim_type_requirement_id;
}
+ public function set_location_id($location_id)
+ {
+ $this->location_id = $location_id;
+ }
+
+ public function get_location_id()
+ {
+ return $this->location_id;
+ }
+
+ public function set_cust_attribute_id($cust_attribute_id)
+ {
+ $this->cust_attribute_id = $cust_attribute_id;
+ }
+
+ public function get_cust_attribute_id()
+ {
+ return $this->cust_attribute_id;
+ }
+
public function set_value($value)
{
$this->value = $value;
Copied: branches/Version-1_0-branch/logistic/js/logistic/activity.js (from rev
10165, trunk/logistic/js/logistic/activity.js)
===================================================================
--- branches/Version-1_0-branch/logistic/js/logistic/activity.js
(rev 0)
+++ branches/Version-1_0-branch/logistic/js/logistic/activity.js
2012-10-09 07:54:03 UTC (rev 10166)
@@ -0,0 +1,4 @@
+$(document).ready(function(){
+
+
+});
\ No newline at end of file
Copied: branches/Version-1_0-branch/logistic/js/logistic/allocation.js (from
rev 10165, trunk/logistic/js/logistic/allocation.js)
===================================================================
--- branches/Version-1_0-branch/logistic/js/logistic/allocation.js
(rev 0)
+++ branches/Version-1_0-branch/logistic/js/logistic/allocation.js
2012-10-09 07:54:03 UTC (rev 10166)
@@ -0,0 +1,4 @@
+$(document).ready(function(){
+
+
+});
\ No newline at end of file
Copied:
branches/Version-1_0-branch/logistic/js/logistic/bim_type_requirement.js (from
rev 10165, trunk/logistic/js/logistic/bim_type_requirement.js)
===================================================================
--- branches/Version-1_0-branch/logistic/js/logistic/bim_type_requirement.js
(rev 0)
+++ branches/Version-1_0-branch/logistic/js/logistic/bim_type_requirement.js
2012-10-09 07:54:03 UTC (rev 10166)
@@ -0,0 +1,64 @@
+$(document).ready(function(){
+
+ $("#entity_id").change(function () {
+ var oArgs =
{menuaction:'logistic.uibim_type_requirement.get_bim_level1', entity_id:
$(this).val()};
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+
+ var htmlString = "";
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl,
+ success: function(data)
+ {
+ if( data != null)
+ {
+ htmlString = "<option>Velg</option>"
+
+ $.each(data, function(i) {
+ var selected = '';
+ htmlString += "<option
value='" + data[i].id + "'" + selected + ">" + data[i].name + "</option>";
+ });
+
+ $("#category_id").html( htmlString );
+ }
+ else
+ {
+ htmlString += "";
+ $("#category_id").html( htmlString );
+ }
+ }
+ });
+ });
+
+ $("#category_id").change(function () {
+ var oArgs =
{menuaction:'logistic.uibim_type_requirement.get_bim_level2', entity_id:
$("#entity_id").val(), cat_id: $(this).val()};
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+
+ var htmlString = "";
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl,
+ success: function(data)
+ {
+ if( data != null)
+ {
+ $.each(data, function(i) {
+ htmlString += "<input
type='checkbox' name='attributes[]' id='attributes[]' value='" + data[i].id +
"'/>" + data[i].input_text + " (" + data[i].trans_datatype + ")<br/>";
+ });
+
+ $("#attributes").html( htmlString );
+ }
+ else
+ {
+ htmlString += "";
+ $("#attributes").html( htmlString );
+ }
+ }
+ });
+ });
+
+});
\ No newline at end of file
Copied: branches/Version-1_0-branch/logistic/js/logistic/project.js (from rev
10165, trunk/logistic/js/logistic/project.js)
===================================================================
--- branches/Version-1_0-branch/logistic/js/logistic/project.js
(rev 0)
+++ branches/Version-1_0-branch/logistic/js/logistic/project.js 2012-10-09
07:54:03 UTC (rev 10166)
@@ -0,0 +1,4 @@
+$(document).ready(function(){
+
+
+});
\ No newline at end of file
Copied: branches/Version-1_0-branch/logistic/js/logistic/requirement.js (from
rev 10165, trunk/logistic/js/logistic/requirement.js)
===================================================================
--- branches/Version-1_0-branch/logistic/js/logistic/requirement.js
(rev 0)
+++ branches/Version-1_0-branch/logistic/js/logistic/requirement.js
2012-10-09 07:54:03 UTC (rev 10166)
@@ -0,0 +1,4 @@
+$(document).ready(function(){
+
+
+});
\ No newline at end of file
Modified: branches/Version-1_0-branch/logistic/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/logistic/setup/phpgw_no.lang 2012-10-09
07:12:10 UTC (rev 10165)
+++ branches/Version-1_0-branch/logistic/setup/phpgw_no.lang 2012-10-09
07:54:03 UTC (rev 10166)
@@ -2,7 +2,7 @@
Logistic common no Logistikk
project logistic no Prosjekt
activity logistic no Aktivitet
-booking logistic no Booking
+allocation logistic no Beholdning
requirement logistic no Behov
Project name logistic no Navn
Project type logistic no Type
@@ -13,8 +13,9 @@
t_new_activity logistic no Opprett ny aktivitet på dette prosjektet
t_new_requirement logistic no Registrer nytt behov på denne
aktiviteten
t_view_requirements logistic no Vis registrerte behov på denne
aktiviteten
-t_new_booking logistic no Registrer ny booking på denne
aktiviteten
-t_view_bookings logistic no Vis registrerte bookinger på
denne aktiviteten
+t_new_allocation logistic no Registrer ny booking på denne
aktiviteten
+t_view_allocations logistic no Vis registrerte bookinger på
denne aktiviteten
+t_new_type_requirement logistic no Nytt type-krav
Project_type logistic no Prosjekttype
settings logistic no innstillinger
Project types logistic no Prosjekttyper
@@ -29,4 +30,24 @@
my_activities logistic no Mine aktiviteter
Project type name updated logistic no
Prosjekttypenavn oppdatert
Add activity logistic no Legg til aktivitet
-Add sub activity logistic no Legg til subaktivitet
\ No newline at end of file
+Add sub activity logistic no Legg til subaktivitet
+Entity logistic no Entitet
+Category logistic no Kategori
+Attributes logistic no Attributter
+Chosen attributes logistic no Valgte attributter
+Administrate requirements logistic no Administrer type-krav
+bim_type_requirement logistic no Type-krav
+Varchar logistic no Text
+Contact logistic no Kontakt
+Entity types logistic no Entitetstyper
+select value logistic no Velg
+Listbox logistic no Nedtrekksliste
+Custom listboks logistic no Egendefinert nedtrekksliste
+Memo logistic no Tekstfelt
+Integer logistic no Tall
+Muliple radio logistic no Flervalgs radioknapp
+Muliple checkbox logistic no Flervalgs avkrysningsboks
+event logistic no Hendelse
+Link logistic no Lenke
+Add requirement to activity logistic no Legg krav til
aktiviteten
+Add requirement logistic no Legg til krav
\ No newline at end of file
Modified: branches/Version-1_0-branch/logistic/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/setup/setup.inc.php 2012-10-09
07:12:10 UTC (rev 10165)
+++ branches/Version-1_0-branch/logistic/setup/setup.inc.php 2012-10-09
07:54:03 UTC (rev 10166)
@@ -1,6 +1,6 @@
<?php
$setup_info['logistic']['name'] = 'logistic';
- $setup_info['logistic']['version'] = '0.0.2';
+ $setup_info['logistic']['version'] = '0.0.7';
$setup_info['logistic']['app_order'] = 70;
$setup_info['logistic']['enable'] = 1;
$setup_info['logistic']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/logistic/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/setup/tables_current.inc.php
2012-10-09 07:12:10 UTC (rev 10165)
+++ branches/Version-1_0-branch/logistic/setup/tables_current.inc.php
2012-10-09 07:54:03 UTC (rev 10166)
@@ -101,9 +101,9 @@
'lg_bim_item_type_requirement' => array(
'fd' => array(
'id' => array('type' => 'auto',
'precision' => 4, 'nullable' => false),
- 'location_id' => array('type'
=> 'int', 'precision' => 4, 'nullable' => false),
- 'attribute_name' =>
array('type' => 'varchar', 'precision' => 255, 'nullable' => false),
- 'attribute_type' =>
array('type' => 'varchar', 'precision' => 255, 'nullable' => false),
+ 'entity_id' => array('type' =>
'int', 'precision' => 4, 'nullable' => false),
+ 'category_id' => array('type'
=> 'int', 'precision' => 4, 'nullable' => false),
+ 'cust_attribute_id' =>
array('type' => 'varchar', 'precision' => 255, 'nullable' => false),
'project_type_id' =>
array('type' => 'int', 'precision' => 4, 'nullable' => true),
'create_user' => array('type'
=> 'int', 'precision' => 4, 'nullable' => false),
'create_date' => array('type'
=> 'int', 'precision' => 4, 'nullable' => false),
@@ -120,6 +120,9 @@
'fd' => array(
'id' => array('type' => 'auto',
'precision' => 4, 'nullable' => false),
'type_requirement_id' =>
array('type' => 'int', 'precision' => 4, 'nullable' => false),
+ 'requirement_id' =>
array('type' => 'int', 'precision' => 4, 'nullable' => false),
+ 'cust_attribute_id' =>
array('type' => 'int', 'precision' => 4, 'nullable' => false),
+ 'location_id' => array('type'
=> 'int', 'precision' => 4, 'nullable' => false),
'value' => array('type' =>
'varchar', 'precision' => '255', 'nullable' => true),
'create_user' => array('type'
=> 'int', 'precision' => 4, 'nullable' => false),
'create_date' => array('type'
=> 'int', 'precision' => 4, 'nullable' => false),
Modified: branches/Version-1_0-branch/logistic/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/setup/tables_update.inc.php
2012-10-09 07:12:10 UTC (rev 10165)
+++ branches/Version-1_0-branch/logistic/setup/tables_update.inc.php
2012-10-09 07:54:03 UTC (rev 10166)
@@ -14,3 +14,95 @@
$GLOBALS['setup_info']['logistic']['currentver'] = '0.0.2';
return $GLOBALS['setup_info']['logistic']['currentver'];
}
+
+ /* Update Logistic from v 0.0.2 to 0.0.3
+ * Add locations
+ */
+
+ $test[] = '0.0.2';
+ function logistic_upgrade0_0_2()
+ {
+ $GLOBALS['phpgw']->locations->add('.', 'Topp', 'logistic');
+ $GLOBALS['phpgw']->locations->add('.project', 'Prosjekt',
'logistic');
+ $GLOBALS['phpgw']->locations->add('.activity', 'Aktivitet',
'logistic');
+
+ $GLOBALS['setup_info']['logistic']['currentver'] = '0.0.3';
+ return $GLOBALS['setup_info']['logistic']['currentver'];
+ }
+
+ /*
+ * Update Logistic from v 0.0.3 to 0.0.4
+ * Add columns for custom attribute id and location id to
lg_requirement_value
+ * Alter lg_bim_item_type_requirement: add cust_attribute_id column,
remove attribute-colums
+ */
+
+ $test[] = '0.0.3';
+ function logistic_upgrade0_0_3()
+ {
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('lg_requirement_value','location_id',array(
+ 'type' => 'int',
+ 'precision' => 4,
+ 'nullable' => True
+ ));
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('lg_requirement_value','cust_attribute_id',array(
+ 'type' => 'int',
+ 'precision' => 4,
+ 'nullable' => True
+ ));
+
+
$GLOBALS['phpgw_setup']->oProc->DropColumn('lg_bim_item_type_requirement',
array(), 'attribute_name');
+
$GLOBALS['phpgw_setup']->oProc->DropColumn('lg_bim_item_type_requirement',
array(), 'attribute_type');
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('lg_bim_item_type_requirement','cust_attribute_id_id',array(
+ 'type' => 'varchar',
+ 'precision' => '255',
+ 'nullable' => True
+ ));
+
+ $GLOBALS['setup_info']['logistic']['currentver'] = '0.0.4';
+ return $GLOBALS['setup_info']['logistic']['currentver'];
+ }
+
+ $test[] = '0.0.4';
+ function logistic_upgrade0_0_4()
+ {
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('lg_requirement_value','requirement_id',array(
+ 'type' => 'int',
+ 'precision' => 4,
+ 'nullable' => True
+ ));
+
+ $GLOBALS['setup_info']['logistic']['currentver'] = '0.0.5';
+ return $GLOBALS['setup_info']['logistic']['currentver'];
+ }
+
+ $test[] = '0.0.5';
+ function logistic_upgrade0_0_5()
+ {
+
$GLOBALS['phpgw_setup']->oProc->DropColumn('lg_bim_item_type_requirement',
array(), 'cust_attribute_id_id');
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('lg_bim_item_type_requirement','cust_attribute_id',array(
+ 'type' => 'varchar',
+ 'precision' => '255',
+ 'nullable' => True
+ ));
+
+ $GLOBALS['setup_info']['logistic']['currentver'] = '0.0.6';
+ return $GLOBALS['setup_info']['logistic']['currentver'];
+ }
+
+ $test[] = '0.0.6';
+ function logistic_upgrade0_0_6()
+ {
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('lg_bim_item_type_requirement','location_id','entity_id');
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('lg_bim_item_type_requirement','category_id',array(
+ 'type' => 'varchar',
+ 'precision' => '255',
+ 'nullable' => True
+ ));
+
+ $GLOBALS['setup_info']['logistic']['currentver'] = '0.0.7';
+ return $GLOBALS['setup_info']['logistic']['currentver'];
+ }
\ No newline at end of file
Copied:
branches/Version-1_0-branch/logistic/templates/base/bim_type_requirement_item.xsl
(from rev 10165, trunk/logistic/templates/base/bim_type_requirement_item.xsl)
===================================================================
---
branches/Version-1_0-branch/logistic/templates/base/bim_type_requirement_item.xsl
(rev 0)
+++
branches/Version-1_0-branch/logistic/templates/base/bim_type_requirement_item.xsl
2012-10-09 07:54:03 UTC (rev 10166)
@@ -0,0 +1,136 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+
+<xsl:call-template name="yui_phpgw_i18n"/>
+<div class="yui-navset yui-navset-top">
+ <div class="identifier-header">
+ <h1><img src="{img_go_home}" />
+ <xsl:value-of select="php:function('lang',
'Administrate requirements')" />
+ </h1>
+ </div>
+ <div class="yui-content">
+ <div id="details">
+ <form action="#" method="post">
+ <input type="hidden" name="id" value =
"{value_id}">
+ </input>
+ <dl class="proplist-col">
+ <dt>
+ <label><xsl:value-of
select="php:function('lang', 'Project_type')" /></label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when
test="editable">
+ <select
name="project_type_id" id="project_type_id">
+
<xsl:for-each select="project_types">
+
<option value="{id}">
+
<xsl:if test="selected">
+
<xsl:attribute name="selected" value="selected" />
+
</xsl:if>
+
<xsl:value-of select="name"/>
+
</option>
+
</xsl:for-each>
+ </select>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="project_type/name" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <dt>
+
<label><xsl:value-of select="php:function('lang', 'Entity')" /></label>
+ </dt>
+ <dd>
+ <select
name="entity_id" id="entity_id">
+
<xsl:for-each select="entities">
+
<option value="{id}">
+
<xsl:if test="selected">
+
<xsl:attribute name="selected" value="selected" />
+
</xsl:if>
+
<xsl:value-of select="name"/>
+
</option>
+
</xsl:for-each>
+ </select>
+ </dd>
+ <dt>
+
<label><xsl:value-of select="php:function('lang', 'Category')" /></label>
+ </dt>
+ <dd>
+ <select
name="category_id" id="category_id">
+ <xsl:if
test="req_type/category_id">
+
<xsl:for-each select="categories">
+
<option value="{id}">
+
<xsl:if test="selected">
+
<xsl:attribute name="selected" value="selected" />
+
</xsl:if>
+
<xsl:value-of select="name"/>
+
</option>
+
</xsl:for-each>
+
</xsl:if>
+ </select>
+ </dd>
+ <dt>
+
<label><xsl:value-of select="php:function('lang', 'Attributes')" /></label>
+ </dt>
+ <dd>
+ <div
id="attributes">
+ <xsl:if
test="req_type/cust_attribute_id">
+
<xsl:for-each select="attributes">
+
<xsl:if test="input_text">
+
<xsl:choose>
+
<xsl:when test="checked">
+
<input type='checkbox' name='attributes[]'
id='attributes[]' value='{id}' checked='checked'/><xsl:value-of
select="input_text" /> <xsl:value-of select="trans_datatype" /><br/>
+
</xsl:when>
+
<xsl:otherwise>
+
<input type='checkbox' name='attributes[]'
id='attributes[]' value='{id}'/><xsl:value-of select="input_text" />
<xsl:value-of select="trans_datatype" /><br/>
+
</xsl:otherwise>
+
</xsl:choose>
+
</xsl:if>
+
</xsl:for-each>
+
</xsl:if>
+ </div>
+ </dd>
+ </xsl:when>
+ <xsl:otherwise>
+ <dt>
+
<label><xsl:value-of select="php:function('lang', 'Entity')" /></label>
+ </dt>
+ <dd>
+ <xsl:value-of
select="entity/name" />
+ </dd>
+ <dt>
+
<label><xsl:value-of select="php:function('lang', 'Category')" /></label>
+ </dt>
+ <dd>
+ <xsl:value-of
select="category/name" />
+ </dd>
+ <dt>
+
<label><xsl:value-of select="php:function('lang', 'Chosen attributes')"
/></label>
+ </dt>
+ <dd>
+ <xsl:for-each
select="attributes">
+
<xsl:value-of select="input_text" /> (<xsl:value-of select="trans_datatype"
/>)<br/>
+ </xsl:for-each>
+ </dd>
+ </xsl:otherwise>
+ </xsl:choose>
+ </dl>
+ <div class="form-buttons">
+ <xsl:choose>
+ <xsl:when test="editable">
+ <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save')"
/></xsl:variable>
+ <xsl:variable
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')"
/></xsl:variable>
+ <input type="submit"
name="save" value="{$lang_save}" title = "{$lang_save}" />
+ <input type="submit"
name="cancel" value="{$lang_cancel}" title = "{$lang_cancel}" />
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:variable
name="lang_edit"><xsl:value-of select="php:function('lang', 'edit')"
/></xsl:variable>
+ <input type="submit"
name="edit" value="{$lang_edit}" title = "{$lang_edit}" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </form>
+ </div>
+ </div>
+</div>
+</xsl:template>
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/accounts/class.accounts_.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/accounts/class.accounts_ldap.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/accounts/class.accounts_sql.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/accounts/class.accounts_sqlldap.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-active-record.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-active-recordx.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-csvlib.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-datadict.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-error.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-errorhandler.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-errorpear.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-exceptions.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-iterator.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-lib.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-memcache.lib.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-pager.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-pear.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-perf.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-php4.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-time.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Modified: branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-xmlschema.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-xmlschema.inc.php
2012-10-09 07:12:10 UTC (rev 10165)
+++ branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-xmlschema.inc.php
2012-10-09 07:54:03 UTC (rev 10166)
@@ -10,9 +10,9 @@
* build a database on any ADOdb-supported platform using a simple
* XML schema.
*
- * Last Editor: $Author: jlim $
+ * Last Editor: $Author$
* @author Richard Tango-Lowy & Dan Cech
- * @version $Revision: 1.12 $
+ * @version $Revision$
*
* @package axmls
* @tutorial getting_started.pkg
@@ -1211,7 +1211,7 @@
* @tutorial getting_started.pkg
*
* @author Richard Tango-Lowy & Dan Cech
-* @version $Revision: 1.12 $
+* @version $Revision$
*
* @package axmls
*/
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-xmlschema.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Modified:
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-xmlschema03.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-xmlschema03.inc.php
2012-10-09 07:12:10 UTC (rev 10165)
+++ branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-xmlschema03.inc.php
2012-10-09 07:54:03 UTC (rev 10166)
@@ -10,9 +10,9 @@
* build a database on any ADOdb-supported platform using a simple
* XML schema.
*
- * Last Editor: $Author: jlim $
+ * Last Editor: $Author$
* @author Richard Tango-Lowy & Dan Cech
- * @version $Revision: 1.62 $
+ * @version $Revision$
*
* @package axmls
* @tutorial getting_started.pkg
@@ -1310,7 +1310,7 @@
* @tutorial getting_started.pkg
*
* @author Richard Tango-Lowy & Dan Cech
-* @version $Revision: 1.62 $
+* @version $Revision$
*
* @package axmls
*/
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb-xmlschema03.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/adodb.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/contrib/toxmlrpc.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-access.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-db2.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-firebird.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-generic.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-ibase.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-informix.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-mssql.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-mssqlnative.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-oci8.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-postgres.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-sapdb.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-sqlite.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id Revision
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/datadict/datadict-sybase.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-access.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-ado.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-ado5.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-ado_access.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-ado_mssql.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-ads.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-borland_ibase.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-csv.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-db2.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-db2oci.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-db2ora.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id Revision
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-fbsql.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-firebird.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-ibase.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-informix.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-mssql.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-mssql_n.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-mssqlnative.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-mssqlpo.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-mysql.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-mysqlpo.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-mysqlt.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-netezza.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-oci8.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-oci805.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-oci8po.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-odbc_db2.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-odbc_mssql.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-odbc_oracle.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-odbtp.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-odbtp_unicode.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-oracle.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-pdo.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-pdo_mssql.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-pdo_mysql.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-pdo_oci.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-pdo_pgsql.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-pdo_sqlite.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-postgres.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-postgres7.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-postgres8.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-proxy.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-sapdb.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-sqlanywhere.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-sqlite.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-sqlitepo.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-sybase.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-sybase_ase.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-vfp.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-ar.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-bg.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-bgutf8.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-ca.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-cn.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-cz.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-da.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-de.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-en.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-es.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-esperanto.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-fa.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-fr.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-hu.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-it.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-nl.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-pl.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-pt-br.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-ro.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-ru1251.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-sv.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb-uk1251.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/lang/adodb_th.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Modified:
branches/Version-1_0-branch/phpgwapi/inc/adodb/pear/Auth/Container/ADOdb.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/adodb/pear/Auth/Container/ADOdb.php
2012-10-09 07:12:10 UTC (rev 10165)
+++
branches/Version-1_0-branch/phpgwapi/inc/adodb/pear/Auth/Container/ADOdb.php
2012-10-09 07:54:03 UTC (rev 10166)
@@ -27,7 +27,7 @@
*
* @author Richard Tango-Lowy <address@hidden>
* @package Auth
- * @version $Revision: 1.3 $
+ * @version $Revision$
*/
class Auth_Container_ADOdb extends Auth_Container
{
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/pear/Auth/Container/ADOdb.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/perf/perf-db2.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/perf/perf-informix.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/perf/perf-mssql.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/perf/perf-mssqlnative.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/perf/perf-mysql.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/perf/perf-oci8.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/perf/perf-postgres.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/pivottable.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/rsfilter.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on: branches/Version-1_0-branch/phpgwapi/inc/adodb/server.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-compress-bzip2.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-compress-gzip.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-cryptsession.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-cryptsession2.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-encrypt-mcrypt.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-encrypt-md5.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-encrypt-secret.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-encrypt-sha1.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-session-clob.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-session-clob2.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-session.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/adodb-session2.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/crypt.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/old/adodb-cryptsession.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/old/adodb-session-clob.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/old/adodb-session.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/session/old/crypt.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/benchmark.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/cf~testsessions.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/client.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/pdo.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test-active-record.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test-active-recs2.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test-active-relations.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test-active-relationsx.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test-datadict.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test-perf.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test-pgblob.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test-php5.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test-xmlschema.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test2.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test3.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test4.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test5.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/test_rs_array.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/testcache.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/testdatabases.inc.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/testgenid.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/testmssql.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/testoci8.php
___________________________________________________________________
Modified: svn:keywords
- Id
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/phpgwapi/inc/adodb/tests/testoci8cursor.php
___________________________________________________________________
Modified: svn:keywords
- Id
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10166] Merge 10108:10165 from trunk,
Sigurd Nes <=