[Fmsystem-commits] [11656] Merge 11643:11655 from trunk

fmsystem-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11656] Merge 11643:11655 from trunk

From:	Sigurd Nes
Subject:	[Fmsystem-commits] [11656] Merge 11643:11655 from trunk
Date:	Mon, 03 Feb 2014 17:14:16 +0000
Revision: 11656
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11656
Author:   sigurdne
Date:     2014-02-03 17:14:15 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
Merge 11643:11655 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/admin/inc/class.menu.inc.php
    branches/Version-1_0-branch/admin/setup/setup.inc.php
    branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_customsso.inc.php
    branches/Version-1_0-branch/phpgwapi/inc/class.locations.inc.php
    branches/Version-1_0-branch/phpgwapi/inc/class.login.inc.php
    branches/Version-1_0-branch/phpgwapi/inc/class.vfs_braArkiv.inc.php
    
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php
    
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_fileoperation_filesystem.inc.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/Stats.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/PPS/File.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/PPS/Root.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/PPS.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/PCLZip/pclzip.lib.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/extras/ntlm_sasl_client.php
    branches/Version-1_0-branch/phpgwapi/setup/default_records.inc.php
    branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php
    branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php
    branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php
    branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
    branches/Version-1_0-branch/property/inc/class.soentity.inc.php
    branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
    
branches/Version-1_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
    
branches/Version-1_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
    branches/Version-1_0-branch/property/setup/default_records.inc.php
    branches/Version-1_0-branch/property/setup/setup.inc.php
    branches/Version-1_0-branch/property/setup/tables_update.inc.php

Added Paths:
-----------
    branches/Version-1_0-branch/admin/inc/class.cat_hooks.inc.php

Property Changed:
----------------
    branches/Version-1_0-branch/
    branches/Version-1_0-branch/phpgwapi/cron/asyncservices.php
    branches/Version-1_0-branch/phpgwapi/cron/stalesessions.php
    branches/Version-1_0-branch/phpgwapi/doc/generate-class-country.php
    
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-postgres9.inc.php
    branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-sqlite3.inc.php
    branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_customsso.inc.php
    branches/Version-1_0-branch/phpgwapi/inc/class.login.inc.php
    branches/Version-1_0-branch/phpgwapi/inc/class.vfs_braArkiv.inc.php
    
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php
    
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_fileoperation_filesystem.inc.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/Ident.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/Clone.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/HTML/Class.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/Switch.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/Background.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/Input.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/NameSync.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/Nofollow.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/SafeEmbed.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/SafeObject.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/SafeParam.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/TargetBlank.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/Textarea.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ChildDef/List.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ErrorStruct.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Forms.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Iframe.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Name.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Nofollow.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/SafeEmbed.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/SafeObject.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/SafeScripting.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/TargetBlank.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Tidy/Name.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Injector/DisplayLinkURI.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Injector/RemoveEmpty.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Injector/SafeObject.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Length.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/PropertyList.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/PropertyListIterator.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIFilter/DisableResources.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIFilter/Munge.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIFilter/SafeIframe.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIScheme/data.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIScheme/file.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/UnitConverter.php
    
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier.composer.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Autoloader.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/APC.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/CacheBase.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/DiscISAM.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/ICache.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Igbinary.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Memcache.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Memory.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/MemoryGZip.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/MemorySerialized.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/PHPTemp.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/SQLite.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/SQLite3.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Wincache.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorageFactory.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CalcEngine/CyclicReferenceStack.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CalcEngine/Logger.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Database.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/DateTime.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Engineering.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Exception.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/ExceptionHandler.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Financial.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/FormulaParser.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/FormulaToken.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Function.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Functions.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Logical.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/LookupRef.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/MathTrig.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Statistical.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/TextData.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Token/Stack.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/AdvancedValueBinder.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/DataType.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/DataValidation.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/DefaultValueBinder.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/Hyperlink.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/IValueBinder.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/DataSeries.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/DataSeriesValues.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Exception.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Layout.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Legend.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/PlotArea.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Renderer/jpgraph.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Title.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Comment.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/DocumentProperties.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/DocumentSecurity.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Exception.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/HashTable.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/IComparable.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/IOFactory.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/NamedRange.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Abstract.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/CSV.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/DefaultReadFilter.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2003XML.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2007/Chart.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2007/Theme.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2007.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel5/Escher.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel5.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Exception.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Gnumeric.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/HTML.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/IReadFilter.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/IReader.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/OOCalc.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/SYLK.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/ReferenceHelper.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/RichText/ITextElement.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/RichText/Run.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/RichText/TextElement.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/RichText.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Settings.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/CodePage.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Date.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Drawing.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher/DgContainer.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher/DggContainer.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Excel5.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/File.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Font.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/LUDecomposition.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/Matrix.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/QRDecomposition.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/SingularValueDecomposition.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/LMQuadTest.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/LagrangeInterpolation.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/LagrangeInterpolation2.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/LevenbergMarquardt.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/MagicSquareExample.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/Stats.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/benchmark.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/polyfit.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/tile.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/tests/TestMatrix.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/utils/Error.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/utils/Maths.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/ChainedBlockStream.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/PPS/File.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/PPS/Root.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/PPS.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLERead.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/PCLZip/pclzip.lib.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/PasswordHasher.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/String.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/TimeZone.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/XMLWriter.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/ZipArchive.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/ZipStreamWrapper.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/trend/bestFitClass.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/trend/exponentialBestFitClass.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/trend/linearBestFitClass.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/trend/polynomialBestFitClass.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/trend/powerBestFitClass.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/trend/trendClass.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Alignment.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Border.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Borders.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Color.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Conditional.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Fill.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Font.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/NumberFormat.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Protection.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Supervisor.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/AutoFilter/Column.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/AutoFilter.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/BaseDrawing.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/CellIterator.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/ColumnDimension.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/Drawing/Shadow.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/Drawing.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/HeaderFooter.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/HeaderFooterDrawing.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/MemoryDrawing.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/PageMargins.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/PageSetup.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/Protection.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/Row.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/RowDimension.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/RowIterator.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/SheetView.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/WorksheetIterator.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Abstract.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/CSV.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Chart.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Comments.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/ContentTypes.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/DocProps.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Drawing.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Rels.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/StringTable.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Style.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Theme.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Workbook.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Worksheet.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/WriterPart.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5/BIFFwriter.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5/Escher.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5/Font.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5/Parser.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5/Workbook.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5/Worksheet.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5/Xf.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Exception.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/HTML.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/IWriter.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/PDF/Core.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/PDF/DomPDF.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/PDF/mPDF.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/PDF/tcPDF.php
    branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/PDF.php
    branches/Version-1_0-branch/phpgwapi/inc/phpmailer/PHPMailerAutoload.php
    branches/Version-1_0-branch/phpgwapi/inc/phpmailer/extras/EasyPeasyICS.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/extras/class.html2text.php
    branches/Version-1_0-branch/phpgwapi/inc/phpmailer/extras/htmlfilter.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/extras/ntlm_sasl_client.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-eo.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-fa.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-he.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-lt.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-sk.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-uk.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/test/phpmailerLangTest.php
    
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/test/testbootstrap-dist.php
    branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/combo.php
    branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/lib/YUICombo.php
    
branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/lib/YUIFileUtil.php
    
branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/lib/YUIHeaderUtil.php
    branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/settings.php
    branches/Version-1_0-branch/phpgwapi/js/ckeditor/_samples/php/advanced.php
    branches/Version-1_0-branch/phpgwapi/js/ckeditor/_samples/php/events.php
    branches/Version-1_0-branch/phpgwapi/js/ckeditor/_samples/php/replace.php
    branches/Version-1_0-branch/phpgwapi/js/ckeditor/_samples/php/replaceall.php
    branches/Version-1_0-branch/phpgwapi/js/ckeditor/_samples/php/standalone.php
    
branches/Version-1_0-branch/phpgwapi/js/ckeditor/_samples/sample_posteddata.php
    branches/Version-1_0-branch/phpgwapi/js/ckeditor/ckeditor.php
    branches/Version-1_0-branch/phpgwapi/js/ckeditor/ckeditor_php4.php
    branches/Version-1_0-branch/phpgwapi/js/ckeditor/ckeditor_php5.php
    
branches/Version-1_0-branch/phpgwapi/js/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php
    
branches/Version-1_0-branch/phpgwapi/js/fckeditor/editor/filemanager/browser/default/connectors/php/basexml.php
    
branches/Version-1_0-branch/phpgwapi/js/fckeditor/editor/filemanager/browser/default/connectors/php/commands.php
    
branches/Version-1_0-branch/phpgwapi/js/fckeditor/editor/filemanager/browser/default/connectors/php/config.php
    
branches/Version-1_0-branch/phpgwapi/js/fckeditor/editor/filemanager/browser/default/connectors/php/connector.php
    
branches/Version-1_0-branch/phpgwapi/js/fckeditor/editor/filemanager/browser/default/connectors/php/io.php
    
branches/Version-1_0-branch/phpgwapi/js/fckeditor/editor/filemanager/browser/default/connectors/php/util.php
    
branches/Version-1_0-branch/phpgwapi/js/fckeditor/editor/filemanager/upload/php/config.php
    
branches/Version-1_0-branch/phpgwapi/js/fckeditor/editor/filemanager/upload/php/upload.php
    
branches/Version-1_0-branch/phpgwapi/js/fckeditor/editor/filemanager/upload/php/util.php
    
branches/Version-1_0-branch/phpgwapi/js/jquery/development-bundle/demos/autocomplete/search.php
    
branches/Version-1_0-branch/phpgwapi/js/jquery/development-bundle/demos/tabs/ajax/content3-slow.php
    
branches/Version-1_0-branch/phpgwapi/js/jquery/development-bundle/demos/tabs/ajax/content4-broken.php
    branches/Version-1_0-branch/phpgwapi/js/jscalendar/jscalendar-setup.php
    
branches/Version-1_0-branch/phpgwapi/js/tinymce/other/examples/testcases/dump.php
    branches/Version-1_0-branch/phpgwapi/js/uploadify/check.php
    
branches/Version-1_0-branch/phpgwapi/js/uploadify/uploadify-check-exists_v2.php
    branches/Version-1_0-branch/phpgwapi/js/uploadify/uploadify.php
    branches/Version-1_0-branch/phpgwapi/js/uploadify/uploadify_v3.php
    
branches/Version-1_0-branch/phpgwapi/js/yahoo/examples/treeview/assets/ysuggest_proxy.php
    branches/Version-1_0-branch/phpgwapi/setup/default_records.inc.php
    branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php
    branches/Version-1_0-branch/phpgwapi/setup/tables_baseline.inc.php
    branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php
    branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php
    branches/Version-1_0-branch/phpgwapi/setup/test_data.inc.php
    
branches/Version-1_0-branch/phpgwapi/test/CodeSniffer/Standards/phpGroupWare/Sniffs/Classes/ClassDeclarationSniff.php
    
branches/Version-1_0-branch/phpgwapi/test/CodeSniffer/Standards/phpGroupWare/Sniffs/Files/LineLengthSniff.php
    
branches/Version-1_0-branch/phpgwapi/test/CodeSniffer/Standards/phpGroupWare/Sniffs/Files/disallowTrailingWhitespaceSniff.php
    
branches/Version-1_0-branch/phpgwapi/test/CodeSniffer/Standards/phpGroupWare/Sniffs/PHP/ForbiddenFunctionsSniff.php
    
branches/Version-1_0-branch/phpgwapi/test/CodeSniffer/Standards/phpGroupWare/phpGroupWareCodingStandard.php
    branches/Version-1_0-branch/phpgwapi/test/phpunit/TestCustomFields.php
    branches/Version-1_0-branch/phpgwapi/test/phpunit/TestCustomFunctions.php
    branches/Version-1_0-branch/phpgwapi/test/phpunit/phpGroupWareTestSuite.php
    
branches/Version-1_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
    
branches/Version-1_0-branch/property/inc/custom/default/LRS_oppdater_el_anlegg.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,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642
   + 
/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,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655

Copied: branches/Version-1_0-branch/admin/inc/class.cat_hooks.inc.php (from rev 
11655, trunk/admin/inc/class.cat_hooks.inc.php)
===================================================================
--- branches/Version-1_0-branch/admin/inc/class.cat_hooks.inc.php               
                (rev 0)
+++ branches/Version-1_0-branch/admin/inc/class.cat_hooks.inc.php       
2014-02-03 17:14:15 UTC (rev 11656)
@@ -0,0 +1,98 @@
+<?php
+       /**
+       * phpGroupWare - property: a Facilities Management System.
+       *
+       * @author Sigurd Nes <address@hidden>
+       * @copyright Copyright (C) 2014 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/bbb_/ekstern/
+       * @package property
+       * @subpackage entity
+       * @version $Id: class.cat_hooks.inc.php 8281 2011-12-13 09:24:03Z 
sigurdne $
+       */
+
+       /**
+       * hook management for categories
+       * @package admin
+       */
+       class admin_cat_hooks
+       {
+               
+               /**
+                * Handle a new category being added, create location to hold 
ACL-data
+                */
+               function cat_add($data)
+               {
+                       if ( isset($data['cat_owner']) && $data['cat_owner'] != 
-1 )
+                       {
+                               return false; //nothing needed to be done, we 
only care about global cats
+                       }
+
+                       if($data['location_id'])
+                       {
+                               $location_info = 
$GLOBALS['phpgw']->locations->get_name($data['location_id']);
+                               $location = $location_info['location'];
+                               if($location == 'vfs_filedata')
+                               {
+                                       
$GLOBALS['phpgw']->locations->add("vfs_filedata.{$data['cat_id']}", 
$data['cat_name'], 'admin', false, false, false, true);                         
    
+                               }
+                       }
+               }
+
+               /**
+                * Handle a category being deleted, remove the location 
+                */
+               function cat_delete($data)
+               {
+                       if ( isset($data['cat_owner']) && $data['cat_owner'] != 
-1 )
+                       {
+                               return false; //nothing needed to be done, we 
only care about global cats
+                       }
+                       if($data['location_id'])
+                       {
+                               $location_info = 
$GLOBALS['phpgw']->locations->get_name($data['location_id']);
+                               if($location_info['location'] == 'vfs_filedata')
+                               {
+                                       $location = 
"{$location_info['location']}.{$data['cat_id']}";
+                                       
$GLOBALS['phpgw']->locations->delete('admin', $location, false);
+                               }
+                       }
+               }
+
+               /**
+                * Handle a category being edited, update the location info
+                */
+               function cat_edit($data)
+               {
+                       if ( isset($data['cat_owner']) && $data['cat_owner'] != 
-1 )
+                       {
+                               return false; //nothing needed to be done, we 
only care about global cats
+                       }
+
+                       if($data['location_id'])
+                       {
+                               $location_info = 
$GLOBALS['phpgw']->locations->get_name($data['location_id']);
+                               if($location_info['location'] == 'vfs_filedata')
+                               {
+                                       $location = 
"{$location_info['location']}.{$data['cat_id']}";
+                                       
$GLOBALS['phpgw']->locations->update_description($location, $data['cat_name'], 
'admin');
+                               }
+                       }
+               }
+       }

Modified: branches/Version-1_0-branch/admin/inc/class.menu.inc.php
===================================================================
--- branches/Version-1_0-branch/admin/inc/class.menu.inc.php    2014-02-03 
13:30:43 UTC (rev 11655)
+++ branches/Version-1_0-branch/admin/inc/class.menu.inc.php    2014-02-03 
17:14:15 UTC (rev 11656)
@@ -55,7 +55,6 @@
                        );
 
                        $menus['admin'] = array();
-//                     if (! 
$GLOBALS['phpgw']->acl->check('site_config_access', phpgwapi_acl::READ, 
'admin'))
                        if ( $GLOBALS['phpgw']->acl->check('run', 
phpgwapi_acl::READ, 'admin'))
                        {
                                $menus['admin']['index'] = array
@@ -64,6 +63,45 @@
                                        'url'   => 
$GLOBALS['phpgw']->link('/index.php',
                                                                
array('menuaction' => 'admin.uiconfig.index', 'appname' => 'admin'))
                                );
+                               $menus['admin']['file_config'] = array
+                               (
+                                       'text'  => 
$GLOBALS['phpgw']->translation->translate('file configuration', array(), true),
+                                       'url'   => 
$GLOBALS['phpgw']->link('/index.php',
+                                               array
+                                               (
+                                                       'menuaction' => 
'admin.uiconfig2.index',
+                                                       'location_id' => 
$GLOBALS['phpgw']->locations->get_id('admin', 'vfs_filedata')
+                                               )
+                                       )
+                               );      
+
+                               $menus['admin']['file_attribs'] = array
+                               (
+                                       'text'  => 
$GLOBALS['phpgw']->translation->translate('file attributes', array(), true),
+                                       'url'   => 
$GLOBALS['phpgw']->link('/index.php',
+                                               array
+                                               (
+                                                       'menuaction'            
=> 'admin.ui_custom.list_attribute',
+                                                       'appname'               
        => 'admin',
+                                                       'location'              
        => 'vfs_filedata',
+                                                       'menu_selection'        
=> 'admin::file_attribs'
+                                               )
+                                       )
+                               );
+                               $menus['admin']['file_cats']    = array
+                               (
+                                       'text'  => 
$GLOBALS['phpgw']->translation->translate('file categories', array(), true),
+                                       'url'   => 
$GLOBALS['phpgw']->link('/index.php',
+                                               array
+                                               (
+                                                       'menuaction'            
=> 'admin.uicategories.index',
+                                                       'appname'               
        => 'admin',
+                                                       'location'              
        => 'vfs_filedata',
+                                                       'menu_selection'        
=> 'admin::file_cats'
+                                               )
+                                       )
+                               );
+
                        }
 
                        if ( $GLOBALS['phpgw']->acl->check('run', 
phpgwapi_acl::READ, 'admin'))
@@ -115,7 +153,6 @@
                                );
                        }
 
-//                     if (! $GLOBALS['phpgw']->acl->check('sync_account', 
PHPGW_ACL_READ, 'admin'))
                        if ( $GLOBALS['phpgw']->acl->check('run', 
phpgwapi_acl::READ, 'admin'))
                        {
                                $menus['admin']['sync_account'] = array
@@ -125,7 +162,6 @@
                                );
                        }
 
-//                     if (! 
$GLOBALS['phpgw']->acl->check('applications_access', phpgwapi_acl::READ, 
'admin'))
                        if ( $GLOBALS['phpgw']->acl->check('run', 
phpgwapi_acl::READ, 'admin'))
                        {
                                $menus['admin']['apps'] = array
@@ -136,7 +172,6 @@
                                );
                        }
 
-//                     if (! 
$GLOBALS['phpgw']->acl->check('global_categories_access', phpgwapi_acl::READ, 
'admin'))
                        if ( $GLOBALS['phpgw']->acl->check('run', 
phpgwapi_acl::READ, 'admin'))
                        {
                                $menus['admin']['categories'] = array
@@ -147,7 +182,6 @@
                                );
                        }
 
-//                     if (! $GLOBALS['phpgw']->acl->check('account_access', 
phpgwapi_acl::READ, 'admin'))
                        if ( $GLOBALS['phpgw']->acl->check('run', 
phpgwapi_acl::READ, 'admin'))
                        {
                                $menus['admin']['addressmasters'] = array
@@ -161,8 +195,6 @@
                                );
                        }
 
-//                     if ( 
!$GLOBALS['phpgw']->acl->check('mainscreen_message_access', phpgwapi_acl::READ, 
'admin')
-//                             || 
!$GLOBALS['phpgw']->acl->check('mainscreen_message_access', phpgwapi_acl::ADD, 
'admin'))
                        if ( $GLOBALS['phpgw']->acl->check('run', 
phpgwapi_acl::READ, 'admin'))
                        {
                                $menus['admin']['mainscreen'] = array
@@ -173,7 +205,6 @@
                                );
                        }
 
-//                     if (! 
$GLOBALS['phpgw']->acl->check('current_sessions_access', phpgwapi_acl::READ, 
'admin'))
                        if ( $GLOBALS['phpgw']->acl->check('run', 
phpgwapi_acl::READ, 'admin'))
                        {
                                $menus['admin']['sessions'] = array
@@ -184,7 +215,6 @@
                                );
                        }
 
-//                     if (! 
$GLOBALS['phpgw']->acl->check('access_log_access', phpgwapi_acl::READ, 'admin'))
                        if ( $GLOBALS['phpgw']->acl->check('run', 
phpgwapi_acl::READ, 'admin'))
                        {
                                $menus['admin']['access_log'] = array
@@ -195,7 +225,6 @@
                                );
                        }
 
-//                     if (! $GLOBALS['phpgw']->acl->check('error_log_access', 
phpgwapi_acl::READ, 'admin'))
                        if ( $GLOBALS['phpgw']->acl->check('run', 
phpgwapi_acl::READ, 'admin'))
                        {
                                $menus['admin']['error_log'] = array
@@ -206,7 +235,6 @@
                                );
                        }
 
-//                     if (! $GLOBALS['phpgw']->acl->check('error_log_access', 
phpgwapi_acl::READ, 'admin'))
                        if ( $GLOBALS['phpgw']->acl->check('run', 
phpgwapi_acl::READ, 'admin'))
                        {
                                $menus['admin']['log_levels'] = array
@@ -217,7 +245,6 @@
                                );
                        }
 
-//                     if (! 
$GLOBALS['phpgw']->acl->check('applications_access', phpgwapi_acl::PRIV, 
'admin'))
                        if ( $GLOBALS['phpgw']->acl->check('run', 
phpgwapi_acl::READ, 'admin'))
                        {
                                $text = 
$GLOBALS['phpgw']->translation->translate('Find and Register all Application 
Hooks',
@@ -231,7 +258,6 @@
                                );
                        }
 
-//                     if (! 
$GLOBALS['phpgw']->acl->check('asyncservice_access', phpgwapi_acl::READ, 
'admin'))
                        if ( $GLOBALS['phpgw']->acl->check('run', 
phpgwapi_acl::READ, 'admin'))
                        {
                                $menus['admin']['async'] = array
@@ -242,7 +268,6 @@
                                );
                        }
 
-//                     if (! $GLOBALS['phpgw']->acl->check('info_access', 
phpgwapi_acl::READ, 'admin')
                        if ( $GLOBALS['phpgw']->acl->check('run', 
phpgwapi_acl::READ, 'admin')
                                        && function_exists('phpinfo') ) // it 
is possible to disable commands in php.ini
                        {

Modified: branches/Version-1_0-branch/admin/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/admin/setup/setup.inc.php       2014-02-03 
13:30:43 UTC (rev 11655)
+++ branches/Version-1_0-branch/admin/setup/setup.inc.php       2014-02-03 
17:14:15 UTC (rev 11656)
@@ -44,14 +44,16 @@
                'config',
                'deleteaccount',
                'manual',
-               'view_user'
+               'view_user',
+               'menu'                                  => 
'admin.menu.get_menu',
+               'cat_add'                               => 
'admin.cat_hooks.cat_add',
+               'cat_delete'                    => 'admin.cat_hooks.cat_delete',
+               'cat_edit'                              => 
'admin.cat_hooks.cat_edit'
        );
-       $setup_info['admin']['hooks']['menu'] = 'admin.menu.get_menu';
 
        /* Dependencies for this app to work */
        $setup_info['admin']['depends'][] = array
        (
                'appname' => 'phpgwapi',
-               'versions' => Array('0.9.17', '0.9.18')
+               'versions' => array('0.9.17', '0.9.18')
        );
-?>


Property changes on: branches/Version-1_0-branch/phpgwapi/cron/asyncservices.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: branches/Version-1_0-branch/phpgwapi/cron/stalesessions.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/doc/generate-class-country.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-postgres9.inc.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/adodb/drivers/adodb-sqlite3.inc.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id

Modified: 
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_customsso.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_customsso.inc.php  
2014-02-03 13:30:43 UTC (rev 11655)
+++ branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_customsso.inc.php  
2014-02-03 17:14:15 UTC (rev 11656)
@@ -8,7 +8,7 @@
        * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage accounts
-       * @version $Id: class.auth_sql.inc.php 10166 2012-10-09 07:54:03Z 
sigurdne $
+       * @version $Id$
        */
 
        /*


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_customsso.inc.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id

Modified: branches/Version-1_0-branch/phpgwapi/inc/class.locations.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.locations.inc.php    
2014-02-03 13:30:43 UTC (rev 11655)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.locations.inc.php    
2014-02-03 17:14:15 UTC (rev 11656)
@@ -82,10 +82,12 @@
                 * @param string  $appname     the name of the application for 
the location
                 * @param boolean $allow_grant allow grants on the location
                 * @param string  $custom_tbl  table associated with location
+                * @param boolean $c_function allow custom funtion on the 
location
+                * @param boolean $c_attrib allow custom attrib on the location
                 *
                 * @return int the new location id
                 */
-               public function add($location, $descr, $appname, $allow_grant = 
true, $custom_tbl = null, $c_function = false)
+               public function add($location, $descr, $appname, $allow_grant = 
true, $custom_tbl = null, $c_function = false, $c_attrib = false)
                {
                        $app = 
$GLOBALS['phpgw']->applications->name2id($appname);
 
@@ -102,19 +104,28 @@
                                return $this->_db->f('location_id'); // already 
exists so just return the id
                        }
 
-                       if ( is_null($custom_tbl) )
-                       {
-                               $sql = 'INSERT INTO phpgw_locations (app_id, 
name, descr, allow_grant,allow_c_function)'
-                                       . " VALUES ({$app}, '{$location}', 
'{$descr}', {$allow_grant}, {$c_function})";
-                       }
-                       else
-                       {
+                       if($custom_tbl)
+                       {
                                $custom_tbl = 
$this->_db->db_addslashes($custom_tbl);
-                               $sql = 'INSERT INTO phpgw_locations (app_id, 
name, descr, allow_grant, allow_c_attrib, c_attrib_table, allow_c_function)'
-                                       . " VALUES ({$app}, '{$location}', 
'{$descr}', {$allow_grant}, 1, '{$custom_tbl}', $c_function)";
+                               $c_attrib = 1;
                        }
-                       $this->_db->query($sql, __LINE__, __FILE__);
 
+                       $value_set = array
+                       (
+                               'app_id'                        => $app,
+                               'name'                          => $location,
+                               'descr'                         => $descr,
+                               'allow_grant'           => $allow_grant,
+                               'allow_c_attrib'        => $c_attrib ? 1 : 
false,
+                               'c_attrib_table'        => $custom_tbl,
+                               'allow_c_function'      => $c_function
+                       );
+
+                       $cols = implode(',', array_keys($value_set));
+                       $values = 
$this->_db->validate_insert(array_values($value_set));
+
+                       $this->_db->query("INSERT INTO phpgw_locations 
({$cols}) VALUES ({$values})",__LINE__,__FILE__);
+
                        return 
$this->_db->get_last_insert_id('phpgw_locations', 'location_id');
                }
 

Modified: branches/Version-1_0-branch/phpgwapi/inc/class.login.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.login.inc.php        
2014-02-03 13:30:43 UTC (rev 11655)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.login.inc.php        
2014-02-03 17:14:15 UTC (rev 11656)
@@ -8,7 +8,7 @@
        * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General 
Public License v2 or later
        * @package phpgwapi
        * @subpackage login
-       * @version $Id: class.acl.inc.php 10127 2012-10-07 17:06:01Z sigurdne $
+       * @version $Id$
        */
 
        /*


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/class.login.inc.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id

Modified: branches/Version-1_0-branch/phpgwapi/inc/class.vfs_braArkiv.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.vfs_braArkiv.inc.php 
2014-02-03 13:30:43 UTC (rev 11655)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.vfs_braArkiv.inc.php 
2014-02-03 17:14:15 UTC (rev 11656)
@@ -8,7 +8,7 @@
        * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage vfs
-       * @version $Id: class.vfs_sql.inc.php 11334 2013-09-26 18:13:25Z 
sigurdne $
+       * @version $Id$
        */
 
        /**


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_braArkiv.inc.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id

Modified: 
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php
===================================================================
--- 
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php
   2014-02-03 13:30:43 UTC (rev 11655)
+++ 
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php
   2014-02-03 17:14:15 UTC (rev 11656)
@@ -6,7 +6,7 @@
        * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General 
Public License v2 or later
        * @package phpgwapi
        * @subpackage vfs
-       * @version $Id: class.acl.inc.php 11567 2013-12-23 12:49:00Z sigurdne $
+       * @version $Id$
        */
 
        /*
@@ -34,15 +34,21 @@
                public function __construct()
                {
                        $this->db = & $GLOBALS['phpgw']->db;
-                       $location_id            = 
$GLOBALS['phpgw']->locations->get_id('phpgwapi', 'vfs_braArkiv');
+                       $location_id            = 
$GLOBALS['phpgw']->locations->get_id('admin', 'vfs_filedata');
 
                        $c      = CreateObject('admin.soconfig',$location_id);
 
-                       $section = 'webservice';
+                       $section = 'braArkiv';
                        $location_url = 
$c->config_data[$section]['location_url'];//'http://braarkiv.adm.bgo/service/services.asmx';
                        $braarkiv_user =  
$c->config_data[$section]['braarkiv_user'];
                        $braarkiv_pass =  
$c->config_data[$section]['braarkiv_pass'];
 
+                       if(!isset($c->config_data) || !$c->config_data)
+                       {
+                               $this->config = $c;
+                               $this->init_config();
+                       }
+
                        if(!$location_url || !$braarkiv_pass || !$braarkiv_pass)
                        {
                                throw new Exception('braArkiv is not 
configured');
@@ -66,6 +72,50 @@
                        $this->secKey = $secKey;
                }
 
+
+               private function init_config()
+               {
+                       $receipt_section = $this->config->add_section(array
+                               (
+                                       'name' => 'braArkiv',
+                                       'descr' => 'braArkiv'
+                               )
+                       );
+
+                       $receipt = $this->config->add_attrib(array
+                               (
+                                       'section_id'    => 
$receipt_section['section_id'],
+                                       'input_type'    => 'text',
+                                       'name'                  => 
'location_url',
+                                       'descr'                 => 'Location 
url'
+                               )
+                       );
+                       $receipt = $this->config->add_attrib(array
+                               (
+                                       'section_id'    => 
$receipt_section['section_id'],
+                                       'input_type'    => 'text',
+                                       'name'                  => 
'braarkiv_user',
+                                       'descr'                 => 'braArkiv 
user'
+                               )
+                       );
+
+                       $receipt = $this->config->add_attrib(array
+                               (
+                                       'section_id'    => 
$receipt_section['section_id'],
+                                       'input_type'    => 'password',
+                                       'name'                  => 
'braarkiv_pass',
+                                       'descr'                 => 'braArkiv 
password'
+                               )
+                       );
+
+                       $GLOBALS['phpgw']->redirect_link('/index.php', array(
+                                       'menuaction'    => 
'admin.uiconfig2.list_attrib',
+                                       'section_id'    => 
$receipt_section['section_id'],
+                                       'location_id'   => 
$GLOBALS['phpgw']->locations->get_id('admin', 'vfs_filedata')
+                               )
+                       );
+               }
+
                /**
                * Get file id corresponding to braArkiv
                * @param object $p path_parts
@@ -157,6 +207,7 @@
                /**
                * Write content to braArkiv
                * @param object $p path_parts
+               * @param string $content filecontent
                * @return boolean.  True if copy is ok, False otherwise.
                */
                public function write($to, $content)
@@ -185,7 +236,7 @@
                                
$this->Services->fileTransferSendChunk($fileTransferSendChunk);
                        }
                        
-                       $fileTransferSendChunkedEnd = new 
fileTransferSendChunkedEnd()
+                       $fileTransferSendChunkedEnd = new 
fileTransferSendChunkedEnd();
                        $fileTransferSendChunkedEnd->secKey = $this->secKey;
                        $fileTransferSendChunkedEnd->fileid = $transaction_id;
 
@@ -237,8 +288,8 @@
 
                        $createDocument = new createDocument();
                        $createDocument->secKey = $this->secKey;
-                       $createDocument->secKey = false;
-                       $createDocument->secKey = $document;
+                       $createDocument->assignDocKey = false;
+                       $createDocument->doc = $document;
 
                        $createDocumentResponse = 
$this->Services->createDocument($createDocument);
                        $document_id =  
$createDocumentResponse->createDocumentResult;
@@ -246,9 +297,49 @@
 
                }
 
+               /**
+               * Rename a file
+               * @param object $from path_parts
+               * @param object $to path_parts
+               * @return boolean.  True if copy is ok, False otherwise.
+               */
+
                public function rename($from, $to)
                {
-                       return rename($from->real_full_path, 
$to->real_full_path);
+                       $fileid = $this->get_file_id($from);
+                       
+                       $getDocument = new getDocument();
+                       $getDocument->secKey = $this->secKey;
+                       $getDocument->documentId = $fileid;
+                       $getDocumentResponse = 
$this->Services->getDocument($getDocument);
+                       
+                       $document = $getDocumentResponse->getDocumentResult;
+                       
+                       foreach($document->Attributes as & $Attribute)
+                       {
+                               if($Attribute->Name == 'Tittel')
+                               {
+                                       $Attribute->Value = 
$to->fake_name_clean;
+                               }
+                       }
+                       $updateDocument = new $updateDocument();
+                       $updateDocument->secKey = $this->secKey;
+                       $updateDocument->document = $document;
+
+                       try
+                       {
+                               $updateDocumentResponse = 
$this->Services->updateDocument($getDocument);
+                       }
+
+                       catch(Exception $e)
+                       {
+                               if ( $e )
+                               {
+                                       throw $e;
+                               }
+                       }
+
+                       return true;
                }
 
                /**


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id

Modified: 
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_fileoperation_filesystem.inc.php
===================================================================
--- 
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_fileoperation_filesystem.inc.php
 2014-02-03 13:30:43 UTC (rev 11655)
+++ 
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_fileoperation_filesystem.inc.php
 2014-02-03 17:14:15 UTC (rev 11656)
@@ -6,7 +6,7 @@
        * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General 
Public License v2 or later
        * @package phpgwapi
        * @subpackage vfs
-       * @version $Id: class.acl.inc.php 11567 2013-12-23 12:49:00Z sigurdne $
+       * @version $Id$
        */
 
        /*


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_fileoperation_filesystem.inc.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/Ident.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/Clone.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/HTML/Class.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/Switch.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/Background.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/Input.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/NameSync.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/Nofollow.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/SafeEmbed.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/SafeObject.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/SafeParam.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/TargetBlank.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrTransform/Textarea.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ChildDef/List.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ErrorStruct.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Forms.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Iframe.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Name.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Nofollow.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/SafeEmbed.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/SafeObject.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/SafeScripting.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/TargetBlank.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/HTMLModule/Tidy/Name.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Injector/DisplayLinkURI.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Injector/RemoveEmpty.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Injector/SafeObject.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Length.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/PropertyList.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/PropertyListIterator.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIFilter/DisableResources.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIFilter/Munge.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIFilter/SafeIframe.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIScheme/data.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/URIScheme/file.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/UnitConverter.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier.composer.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Autoloader.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/APC.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/CacheBase.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/DiscISAM.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/ICache.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Igbinary.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Memcache.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Memory.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/MemoryGZip.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/MemorySerialized.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/PHPTemp.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/SQLite.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/SQLite3.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Wincache.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorageFactory.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CalcEngine/CyclicReferenceStack.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CalcEngine/Logger.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Database.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/DateTime.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Engineering.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Exception.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/ExceptionHandler.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Financial.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/FormulaParser.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/FormulaToken.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Function.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Functions.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Logical.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/LookupRef.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/MathTrig.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Statistical.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/TextData.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Token/Stack.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/AdvancedValueBinder.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/DataType.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/DataValidation.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/DefaultValueBinder.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/Hyperlink.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/IValueBinder.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/DataSeries.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/DataSeriesValues.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Exception.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Layout.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Legend.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/PlotArea.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Renderer/jpgraph.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Title.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Comment.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/DocumentProperties.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/DocumentSecurity.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Exception.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/HashTable.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/IComparable.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/IOFactory.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/NamedRange.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Abstract.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/CSV.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/DefaultReadFilter.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2003XML.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2007/Chart.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2007/Theme.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2007.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel5/Escher.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel5.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Exception.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Gnumeric.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/HTML.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/IReadFilter.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/IReader.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/OOCalc.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/SYLK.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/ReferenceHelper.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/RichText/ITextElement.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/RichText/Run.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/RichText/TextElement.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/RichText.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Settings.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/CodePage.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Date.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Drawing.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher/DgContainer.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher/DggContainer.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Excel5.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/File.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Font.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/LUDecomposition.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/Matrix.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/QRDecomposition.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/SingularValueDecomposition.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/LMQuadTest.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/LagrangeInterpolation.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/LagrangeInterpolation2.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/LevenbergMarquardt.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/MagicSquareExample.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id

Modified: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/Stats.php
===================================================================
--- 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/Stats.php
   2014-02-03 13:30:43 UTC (rev 11655)
+++ 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/Stats.php
   2014-02-03 17:14:15 UTC (rev 11656)
@@ -16,7 +16,7 @@
 // | Authors: Jesus M. Castagnetto <address@hidden>                |
 // +----------------------------------------------------------------------+
 //
-// $Id: Stats.php,v 1.15 2003/06/01 11:40:30 jmcastagnetto Exp $
+// $Id$
 //
 
 include_once 'PEAR.php';


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/Stats.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/benchmark.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/polyfit.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/examples/tile.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/tests/TestMatrix.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/utils/Error.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/utils/Maths.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/ChainedBlockStream.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id

Modified: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/PPS/File.php
===================================================================
--- 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/PPS/File.php
  2014-02-03 13:30:43 UTC (rev 11655)
+++ 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/PPS/File.php
  2014-02-03 17:14:15 UTC (rev 11656)
@@ -17,7 +17,7 @@
 // | Based on OLE::Storage_Lite by Kawai, Takanori                        |
 // +----------------------------------------------------------------------+
 //
-// $Id: File.php,v 1.11 2007/02/13 21:00:42 schmidt Exp $
+// $Id$
 
 
 /**


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/PPS/File.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id

Modified: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/PPS/Root.php
===================================================================
--- 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/PPS/Root.php
  2014-02-03 13:30:43 UTC (rev 11655)
+++ 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/PPS/Root.php
  2014-02-03 17:14:15 UTC (rev 11656)
@@ -17,7 +17,7 @@
 // | Based on OLE::Storage_Lite by Kawai, Takanori                        |
 // +----------------------------------------------------------------------+
 //
-// $Id: Root.php,v 1.9 2005/04/23 21:53:49 dufuz Exp $
+// $Id$
 
 
 /**


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/PPS/Root.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id

Modified: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/PPS.php
===================================================================
--- 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/PPS.php   
    2014-02-03 13:30:43 UTC (rev 11655)
+++ 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/PPS.php   
    2014-02-03 17:14:15 UTC (rev 11656)
@@ -17,7 +17,7 @@
 // | Based on OLE::Storage_Lite by Kawai, Takanori                        |
 // +----------------------------------------------------------------------+
 //
-// $Id: PPS.php,v 1.7 2007/02/13 21:00:42 schmidt Exp $
+// $Id$
 
 
 /**


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/PPS.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id

Modified: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE.php   
2014-02-03 13:30:43 UTC (rev 11655)
+++ branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE.php   
2014-02-03 17:14:15 UTC (rev 11656)
@@ -17,7 +17,7 @@
 // | Based on OLE::Storage_Lite by Kawai, Takanori                        |
 // +----------------------------------------------------------------------+
 //
-// $Id: OLE.php,v 1.13 2007/03/07 14:38:25 schmidt Exp $
+// $Id$
 
 
 /**


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLERead.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id

Modified: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/PCLZip/pclzip.lib.php
===================================================================
--- 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/PCLZip/pclzip.lib.php
     2014-02-03 13:30:43 UTC (rev 11655)
+++ 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/PCLZip/pclzip.lib.php
     2014-02-03 17:14:15 UTC (rev 11656)
@@ -22,7 +22,7 @@
 //   The use of this software is at the risk of the user.
 //
 // 
--------------------------------------------------------------------------------
-// $Id: pclzip.lib.php,v 1.60 2009/09/30 21:01:04 vblavet Exp $
+// $Id$
 // 
--------------------------------------------------------------------------------
 
   // ----- Constants


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/PCLZip/pclzip.lib.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/PasswordHasher.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/String.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/TimeZone.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/XMLWriter.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/ZipArchive.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/ZipStreamWrapper.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/trend/bestFitClass.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/trend/exponentialBestFitClass.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/trend/linearBestFitClass.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/trend/polynomialBestFitClass.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/trend/powerBestFitClass.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/trend/trendClass.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Alignment.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Border.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Borders.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Color.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Conditional.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Fill.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Font.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/NumberFormat.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Protection.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Supervisor.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/AutoFilter/Column.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/AutoFilter.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/BaseDrawing.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/CellIterator.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/ColumnDimension.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/Drawing/Shadow.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/Drawing.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/HeaderFooter.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/HeaderFooterDrawing.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/MemoryDrawing.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/PageMargins.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/PageSetup.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/Protection.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/Row.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/RowDimension.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/RowIterator.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/SheetView.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/WorksheetIterator.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Abstract.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/CSV.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Chart.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Comments.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/ContentTypes.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/DocProps.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Drawing.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Rels.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/StringTable.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Style.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Theme.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Workbook.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Worksheet.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/WriterPart.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5/BIFFwriter.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5/Escher.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5/Font.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5/Parser.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5/Workbook.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5/Worksheet.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5/Xf.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Exception.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/HTML.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/IWriter.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/PDF/Core.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/PDF/DomPDF.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/PDF/mPDF.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/PDF/tcPDF.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/PDF.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/PHPMailerAutoload.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/extras/EasyPeasyICS.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/extras/class.html2text.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/extras/htmlfilter.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id

Modified: 
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/extras/ntlm_sasl_client.php
===================================================================
--- 
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/extras/ntlm_sasl_client.php  
    2014-02-03 13:30:43 UTC (rev 11655)
+++ 
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/extras/ntlm_sasl_client.php  
    2014-02-03 17:14:15 UTC (rev 11656)
@@ -2,7 +2,7 @@
 /*
  * ntlm_sasl_client.php
  *
- * @(#) $Id: ntlm_sasl_client.php,v 1.3 2004/11/17 08:00:37 mlemos Exp $
+ * @(#) $Id$
  *
  **
  ** Source: http://www.phpclasses.org/browse/file/7495.html


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/extras/ntlm_sasl_client.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-eo.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-fa.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-he.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-lt.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-sk.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/language/phpmailer.lang-uk.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/test/phpmailerLangTest.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/phpmailer/test/testbootstrap-dist.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/combo.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/lib/YUICombo.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/lib/YUIFileUtil.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/lib/YUIHeaderUtil.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/settings.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/ckeditor/_samples/php/advanced.php
___________________________________________________________________
Modified: svn:keywords
   - Id Revision
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/ckeditor/_samples/php/events.php
___________________________________________________________________
Modified: svn:keywords
   - Id Revision
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/ckeditor/_samples/php/replace.php
___________________________________________________________________
Modified: svn:keywords
   - Id Revision
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/ckeditor/_samples/php/replaceall.php
___________________________________________________________________
Modified: svn:keywords
   - Id Revision
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/ckeditor/_samples/php/standalone.php
___________________________________________________________________
Modified: svn:keywords
   - Id Revision
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/ckeditor/_samples/sample_posteddata.php
___________________________________________________________________
Modified: svn:keywords
   - Id Revision
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/ckeditor/ckeditor.php
___________________________________________________________________
Modified: svn:keywords
   - Id Revision
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/ckeditor/ckeditor_php4.php
___________________________________________________________________
Modified: svn:keywords
   - Id Revision
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/ckeditor/ckeditor_php5.php
___________________________________________________________________
Modified: svn:keywords
   - Id Revision
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/fckeditor/editor/filemanager/browser/default/connectors/php/basexml.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/fckeditor/editor/filemanager/browser/default/connectors/php/commands.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/fckeditor/editor/filemanager/browser/default/connectors/php/config.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/fckeditor/editor/filemanager/browser/default/connectors/php/connector.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/fckeditor/editor/filemanager/browser/default/connectors/php/io.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/fckeditor/editor/filemanager/browser/default/connectors/php/util.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/fckeditor/editor/filemanager/upload/php/config.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/fckeditor/editor/filemanager/upload/php/upload.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/fckeditor/editor/filemanager/upload/php/util.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/jquery/development-bundle/demos/autocomplete/search.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/jquery/development-bundle/demos/tabs/ajax/content3-slow.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/jquery/development-bundle/demos/tabs/ajax/content4-broken.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/jscalendar/jscalendar-setup.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/tinymce/other/examples/testcases/dump.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: branches/Version-1_0-branch/phpgwapi/js/uploadify/check.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/uploadify/uploadify-check-exists_v2.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/uploadify/uploadify.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/uploadify/uploadify_v3.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/js/yahoo/examples/treeview/assets/ysuggest_proxy.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id

Modified: branches/Version-1_0-branch/phpgwapi/setup/default_records.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/default_records.inc.php  
2014-02-03 13:30:43 UTC (rev 11655)
+++ branches/Version-1_0-branch/phpgwapi/setup/default_records.inc.php  
2014-02-03 17:14:15 UTC (rev 11656)
@@ -367,3 +367,4 @@
 
        $GLOBALS['phpgw']->locations->add('changepassword', 'allow user to 
change password', 'preferences', false);
        $GLOBALS['phpgw']->locations->add('anonymous', 'allow anonymous 
sessions for public modules', 'phpgwapi', false);
+       $GLOBALS['phpgw']->locations->add('vfs_filedata', 'config section for 
VFS filedata - file backend', 'admin', false);


Property changes on: 
branches/Version-1_0-branch/phpgwapi/setup/default_records.inc.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id

Modified: branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php    2014-02-03 
13:30:43 UTC (rev 11655)
+++ branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php    2014-02-03 
17:14:15 UTC (rev 11656)
@@ -12,7 +12,7 @@
        // Basic information about this app
        $setup_info['phpgwapi']['name']      = 'phpgwapi';
        $setup_info['phpgwapi']['title']     = 'phpgwapi';
-       $setup_info['phpgwapi']['version']   = '0.9.17.543';
+       $setup_info['phpgwapi']['version']   = '0.9.17.544';
        $setup_info['phpgwapi']['versions']['current_header'] = '1.31';
        $setup_info['phpgwapi']['versions']['system'] = '1.0';
        $setup_info['phpgwapi']['enable']    = 3;
@@ -63,6 +63,7 @@
                'phpgw_preferences',
                'phpgw_sessions',
                'phpgw_vfs',
+               'phpgw_vfs_filedata',
                'phpgw_config2_section',
                'phpgw_config2_attrib',
                'phpgw_config2_choice',


Property changes on: branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/setup/tables_baseline.inc.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id

Modified: branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php   
2014-02-03 13:30:43 UTC (rev 11655)
+++ branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php   
2014-02-03 17:14:15 UTC (rev 11656)
@@ -297,6 +297,19 @@
                        'ix' => array(),
                        'uc' => array()
                ),
+
+               'phpgw_vfs_filedata' => array(
+                       'fd' => array(
+                               'file_id' => array('type' => 'int','precision' 
=> '4','nullable' => False),
+                               'location_id' => array('type' => 
'int','precision' => '4','nullable' => False),
+                               'metadata' => array('type' => 'xml','nullable' 
=> False),
+                       ),
+                       'pk' => array('file_id'),
+                       'fk' => array('phpgw_vfs' => array('file_id' => 
'file_id')),
+                       'ix' => array(),
+                       'uc' => array()
+               ),
+
                'phpgw_history_log' => array(
                        'fd' => array(
                                'history_id' => array('type' => 
'auto','precision' => 4,'nullable' => False),


Property changes on: 
branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id

Modified: branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php    
2014-02-03 13:30:43 UTC (rev 11655)
+++ branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php    
2014-02-03 17:14:15 UTC (rev 11656)
@@ -3178,3 +3178,35 @@
                        return $GLOBALS['setup_info']['phpgwapi']['currentver'];
                }
        }
+
+       $test[] = '0.9.17.543';
+       /**
+       * Enable external integration with vfs
+       *
+       * @return string the new version number
+       */
+       function phpgwapi_upgrade0_9_17_543()
+       {
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+               $GLOBALS['phpgw']->locations->add('vfs_filedata', 'config 
section for VFS filedata - file backend', 'admin', false);
+
+               
$GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_vfs_filedata',array(
+                       'fd' => array(
+                               'file_id' => array('type' => 'int','precision' 
=> '4','nullable' => False),
+                               'location_id' => array('type' => 
'int','precision' => '4','nullable' => False),
+                               'metadata' => array('type' => 'xml','nullable' 
=> False),
+                       ),
+                       'pk' => array('file_id'),
+                       'fk' => array('phpgw_vfs' => array('file_id' => 
'file_id')),
+                       'ix' => array(),
+                       'uc' => array()
+               ));
+
+               if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+               {
+                       $GLOBALS['setup_info']['phpgwapi']['currentver'] = 
'0.9.17.544';
+                       return $GLOBALS['setup_info']['phpgwapi']['currentver'];
+               }
+       }
+


Property changes on: 
branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/setup/test_data.inc.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/test/CodeSniffer/Standards/phpGroupWare/Sniffs/Classes/ClassDeclarationSniff.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/test/CodeSniffer/Standards/phpGroupWare/Sniffs/Files/LineLengthSniff.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/test/CodeSniffer/Standards/phpGroupWare/Sniffs/Files/disallowTrailingWhitespaceSniff.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/test/CodeSniffer/Standards/phpGroupWare/Sniffs/PHP/ForbiddenFunctionsSniff.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/test/CodeSniffer/Standards/phpGroupWare/phpGroupWareCodingStandard.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/test/phpunit/TestCustomFields.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/test/phpunit/TestCustomFunctions.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/phpgwapi/test/phpunit/phpGroupWareTestSuite.php
___________________________________________________________________
Modified: svn:keywords
   - Id
   + Revision Author Id

Modified: branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bolocation.inc.php   
2014-02-03 13:30:43 UTC (rev 11655)
+++ branches/Version-1_0-branch/property/inc/class.bolocation.inc.php   
2014-02-03 17:14:15 UTC (rev 11656)
@@ -542,9 +542,10 @@
                                        $p_cat_id = 
isset($data['entity_data'][$entity['id']]['p_cat_id']) ? 
$data['entity_data'][$entity['id']]['p_cat_id'] : '';
                                        $lookup_functions[] = array
                                                (
-                                                       'name'          => 
'lookup_entity_' . $entity['id'] .'()',
-                                                       'link'          => 
"menuaction:'property.uilookup.entity',location_type:{$data['type_id']},entity_id:{$entity['id']},cat_id:'{$p_cat_id}',location_code:'{$filter_location}',block_query:'{$block_query}'",
-                                                       'action'        => 
'Window1=window.open(strURL,"Search","left=50,top=100,width=1200,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
+                                                       'filter_level'          
=> count($location_types),
+                                                       'name'                  
        => 'lookup_entity_' . $entity['id'] .'()',
+                                                       'link'                  
        => 
"menuaction:'property.uilookup.entity',location_type:{$data['type_id']},entity_id:{$entity['id']},cat_id:'{$p_cat_id}',location_code:'{$filter_location}',block_query:'{$block_query}'",
+                                                       'action'                
        => 
'Window1=window.open(strURL,"Search","left=50,top=100,width=1200,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
                                                );
 
                                        $location['location'][$i]['input_type'] 
                                        = 'text';
@@ -665,18 +666,25 @@
                                                        {
                                                                
for(i=1;i<=filter_level;i++)
                                                                {
-                                                                       
if(eval('document.form.loc'+i+'.value'))
+                                                                       if 
(typeof eval('document.form.loc'+i) != 'undefined')
                                                                        {
-                                                                               
block = true;
-                                                                               
if(!filter)
+                                                                               
if( eval('document.form.loc'+i+'.value'))
                                                                                
{
-                                                                               
        filter = eval('document.form.loc'+i+'.value');
+                                                                               
        block = true;
+                                                                               
        if(!filter)
+                                                                               
        {
+                                                                               
                filter = eval('document.form.loc'+i+'.value');
+                                                                               
        }
+                                                                               
        else
+                                                                               
        {
+                                                                               
                filter = filter  + '-' + eval('document.form.loc'+i+'.value');  
                                                                
+                                                                               
        }
                                                                                
}
-                                                                               
else
-                                                                               
{
-                                                                               
        filter = filter  + '-' + eval('document.form.loc'+i+'.value');          
                                                        
-                                                                               
}
                                                                        }
+                                                                       else
+                                                                       {
+                                                                               
break;
+                                                                       }
                                                                }
                                                        }
 JS;

Modified: branches/Version-1_0-branch/property/inc/class.soentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soentity.inc.php     
2014-02-03 13:30:43 UTC (rev 11655)
+++ branches/Version-1_0-branch/property/inc/class.soentity.inc.php     
2014-02-03 17:14:15 UTC (rev 11656)
@@ -858,6 +858,7 @@
                                                'datatype'      => false,
                                                'attrib_id'     => false
                                        );
+
                                $dataset[$j]['_type'] = array
                                        (
                                                'value'         => $this->type,
@@ -865,9 +866,15 @@
                                                'attrib_id'     => false
                                        );
 
-
                                if($lookup)
                                {
+                                       $dataset[$j]["entity_num_{$entity_id}"] 
= array
+                                               (
+                                                       'value'         => 
$this->db->f('id'),
+                                                       'datatype'      => 
false,
+                                                       'attrib_id'     => 
false,
+                                               );
+
                                        
$dataset[$j]["entity_cat_name_{$entity_id}"] = array
                                                (
                                                        'value'         => 
$category['name'],

Modified: branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php  
2014-02-03 13:30:43 UTC (rev 11655)
+++ branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php  
2014-02-03 17:14:15 UTC (rev 11656)
@@ -1917,14 +1917,27 @@
                                }
                        }
 
-                       $sql = "SELECT order_id, periode, amount AS actual_cost"
+                       $sql = "SELECT order_id, periode, amount AS 
actual_cost, periodization, periodization_start"
                        . " FROM fm_workorder {$this->join} 
fm_orders_paid_or_pending_view ON fm_workorder.id = 
fm_orders_paid_or_pending_view.order_id"
                        . " WHERE order_id = '{$order_id}' ORDER BY periode 
ASC";
 //_debug_array($sql);
                        $this->db->query($sql,__LINE__,__FILE__);
+                       $orders_paid_or_pending = array();
+
                        while ($this->db->next_record())
                        {
-                               $periode = $this->db->f('periode');
+                               $orders_paid_or_pending[] = array
+                               (
+                                       'periode'                               
=> $this->db->f('periode'),
+                                       'actual_cost'                   => 
$this->db->f('actual_cost'),
+                                       'periodization'                 => 
$this->db->f('periodization'),
+                                       'periodization_start'   => 
$this->db->f('periodization_start'),
+                               );
+                       }
+
+                       foreach ( $orders_paid_or_pending as 
$_orders_paid_or_pending)
+                       {
+                               $periode = $_orders_paid_or_pending['periode'];
                                $_dummy_period = $periode ? $periode : 
date('Y') . '00';
 
                                if(!$periode)
@@ -1937,7 +1950,7 @@
                                $_found = false;
                                if(isset($order_budget[$periode]))
                                {
-                                       $order_budget[$periode]['actual_cost'] 
+= $this->db->f('actual_cost');
+                                       $order_budget[$periode]['actual_cost'] 
+= $_orders_paid_or_pending['actual_cost'];
                                        
$order_budget[$periode]['actual_period'] = $periode;
                                        $_found = true;
                                }
@@ -1948,7 +1961,7 @@
                                                $_period = $year . 
sprintf("%02s", $i);
                                                
if(isset($order_budget[$_period]))
                                                {
-                                                       
$order_budget[$_period]['actual_cost'] += $this->db->f('actual_cost');
+                                                       
$order_budget[$_period]['actual_cost'] += 
$_orders_paid_or_pending['actual_cost'];
                                                        
$order_budget[$_period]['actual_period'] = $periode;
                                                        $_found = true;
                                                        break;
@@ -1960,7 +1973,7 @@
                                {
                                        $order_budget[$_dummy_period]['year'] = 
substr( $_dummy_period, 0, 4 );
                                        $order_budget[$_dummy_period]['month'] 
= substr( $_dummy_period, -2);
-                                       
$order_budget[$_dummy_period]['actual_cost'] += $this->db->f('actual_cost');
+                                       
$order_budget[$_dummy_period]['actual_cost'] += 
$_orders_paid_or_pending['actual_cost'];
                                        
$order_budget[$_dummy_period]['actual_period'] = $periode;
                                }
                        }

Modified: 
branches/Version-1_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
===================================================================
--- 
branches/Version-1_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
  2014-02-03 13:30:43 UTC (rev 11655)
+++ 
branches/Version-1_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
  2014-02-03 17:14:15 UTC (rev 11656)
@@ -90,6 +90,11 @@
                                {
                                        $this->db->transaction_begin();
 
+                                       if ($this->debug)
+                                       {
+                                               _debug_array("Start import 
file: $file");
+                                       }
+
                                        $ok = $this->import($file);
 
                                        if ($ok)
@@ -117,11 +122,16 @@
                                        }
                                        else
                                        {
+                                               $this->receipt['error'][] = 
array('msg' => "fil som feiler: $file");
                                                $this->db->transaction_abort();
                                        }
                                }
                                
-                               $this->alert_assigned();
+                               if (!$this->debug)
+                               {
+                                       $this->alert_assigned();
+                               }
+
                        }
                        else
                        {
@@ -175,7 +185,7 @@
 
                                foreach($files as $file_name)
                                {
-                                       if( stripos( $file_name, '.csv' ))
+                                       if( preg_match('/csv$/i', $file_name) )
                                        {
                                                $file_remote = $file_name;      
   
                                                $file_local = 
"{$directory_local}/{$file_name}";
@@ -190,7 +200,7 @@
                                                        }
                                                        else
                                                        {
-                                                               echo "ERROR! 
File remote: {$file_remote} failed to move to remote: 
{$directory_remote}/archive/{$file_name}<br/>";
+                                                               echo "ERROR! 
File remote: {$file_remote} failed to move from remote: 
{$directory_remote}/{$file_name}<br/>";
                                                                
if(unlink($file_local))
                                                                {
                                                                        echo 
"Lokal file was deleted: {$file_local}<br/>";
@@ -221,7 +231,6 @@
                                {
                                        $ok = $this->update_status($data);
                                }
-                               $row ++;
                        }
 
                        fclose($fp);
@@ -231,27 +240,31 @@
 
                private function update_amount($data)
                {
+                       if($this->debug)
+                       {
+                               _debug_array($data);
+                       }
+
                        //prosjektnummer;prosjektstatus;bestillingsnummer;beløp
                $agresso_prosjekt       = (int)$data[0];
                        $prosjektstatus         = trim($data[1]);
                        $order_id                       = trim($data[2]);
                        $diff_actual_cost       = (float)trim($data[3]);
 
-                       $this->db->query("SELECT id, status, actual_cost FROM 
fm_tts_tickets WHERE order_id= '{$order_id}'",__LINE__,__FILE__);
+                       $this->db->query("SELECT id, actual_cost FROM 
fm_tts_tickets WHERE order_id= '{$order_id}'",__LINE__,__FILE__);
                        $this->db->next_record();
                        $id                                                     
= $this->db->f('id');
-                       $old_status                                     = 
$this->db->f('status');
                        (float) $old_actual_cost        = 
$this->db->f('actual_cost');
                        
                        $new_actual_cost = $diff_actual_cost + $old_actual_cost;
 
                        if(!$id)
                        {
-                               $this->receipt['error'][] = array('msg' 
=>"Oppdatere beløp: fant ikke bestillingen, hopper over: {$order_id}");
+                               $this->receipt['error'][] = array('msg' 
=>"Oppdatere beløp for agresso prosjekt {$agresso_prosjekt}: fant ikke 
bestillingen, hopper over: {$order_id}");
                                return false;
                        }
 
-                       $this->receipt['message'][] = array('msg' =>"Oppdaterer 
melding #{$id}, gammelt beløp: {$old_actual_cost}, nytt beløp: 
{$new_actual_cost}");
+                       $this->receipt['message'][] = array('msg' =>"Oppdaterer 
melding #{$id} for agresso prosjekt {$agresso_prosjekt}: gammelt beløp: 
{$old_actual_cost}, nytt beløp: {$new_actual_cost}");
 
                        $value_set = array
                        (
@@ -275,18 +288,25 @@
                {
                $agresso_prosjekt       = (int)$data[0];
                        $prosjektstatus         = trim($data[1]);
+                       $order_id                       = trim($data[2]);
 
-                       $this->db->query("SELECT id, status FROM fm_tts_tickets 
WHERE agresso_prosjekt= '{$agresso_prosjekt}'",__LINE__,__FILE__);
-                       $this->db->next_record();
-                       $id                     = $this->db->f('id');
-                       $old_status = $this->db->f('status');
+                       $id = false;
 
+                       if($order_id)
+                       {
+                               $this->db->query("SELECT id FROM fm_tts_tickets 
WHERE order_id= '{$order_id}'",__LINE__,__FILE__);
+                               $this->db->next_record();
+                               $id                     = $this->db->f('id');
+                       }
+
                        if(!$id)
                        {
-                               $this->receipt['error'][] = array('msg' 
=>"Oppdatere status: fant ikke bestillingen, hopper over: {$agresso_prosjekt}");
+                               $this->receipt['error'][] = array('msg' 
=>"Oppdatere status: fant ikke bestillingen for agresso prosjekt 
{$agresso_prosjekt}");
                                return false;
                        }
 
+                       $this->db->query("UPDATE fm_tts_tickets SET 
agresso_prosjekt = $agresso_prosjekt WHERE id={$id}",__LINE__,__FILE__);
+
                        $ok = true;
                        if(preg_match('/(^C|^P)/i', $prosjektstatus))
                        {

Modified: 
branches/Version-1_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
===================================================================
--- 
branches/Version-1_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
     2014-02-03 13:30:43 UTC (rev 11655)
+++ 
branches/Version-1_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
     2014-02-03 17:14:15 UTC (rev 11656)
@@ -24,7 +24,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage cron
-       * @version $Id: synkroniser_avdelinger_med_fellesdata.php 11571 
2013-12-27 08:26:40Z sigurdne $
+       * @version $Id$
        */
 
        /**


Property changes on: 
branches/Version-1_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id


Property changes on: 
branches/Version-1_0-branch/property/inc/custom/default/LRS_oppdater_el_anlegg.php
___________________________________________________________________
Added: svn:keywords
   + Revision Author Id

Modified: branches/Version-1_0-branch/property/setup/default_records.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/default_records.inc.php  
2014-02-03 13:30:43 UTC (rev 11655)
+++ branches/Version-1_0-branch/property/setup/default_records.inc.php  
2014-02-03 17:14:15 UTC (rev 11656)
@@ -909,15 +909,15 @@
                switch ( $GLOBALS['phpgw_info']['server']['db_type'] )
                {
                        case 'postgres':
-                               $sql = 'CREATE OR REPLACE VIEW 
fm_orders_paid_or_pending_view AS
-                                SELECT orders_paid_or_pending.order_id, 
orders_paid_or_pending.periode, orders_paid_or_pending.amount
-                                       FROM ( SELECT 
fm_ecobilagoverf.pmwrkord_code AS order_id, fm_ecobilagoverf.periode, 
sum(fm_ecobilagoverf.godkjentbelop) AS amount
-                                          FROM fm_ecobilagoverf
-                                        GROUP BY 
fm_ecobilagoverf.pmwrkord_code, fm_ecobilagoverf.periode
+                               $sql = 'CREATE OR REPLACE VIEW 
fm_orders_paid_or_pending_view AS 
+                                SELECT orders_paid_or_pending.order_id, 
orders_paid_or_pending.periode,orders_paid_or_pending.amount,orders_paid_or_pending.periodization,
 orders_paid_or_pending.periodization_start
+                                  FROM ( SELECT fm_ecobilagoverf.pmwrkord_code 
AS order_id, fm_ecobilagoverf.periode, sum(fm_ecobilagoverf.godkjentbelop) AS 
amount, fm_ecobilagoverf.periodization, fm_ecobilagoverf.periodization_start
+                                                  FROM fm_ecobilagoverf
+                                                  GROUP BY 
fm_ecobilagoverf.pmwrkord_code, fm_ecobilagoverf.periode, 
fm_ecobilagoverf.periodization, fm_ecobilagoverf.periodization_start
                                                UNION ALL 
-                                               SELECT 
fm_ecobilag.pmwrkord_code AS order_id, fm_ecobilag.periode, 
sum(fm_ecobilag.godkjentbelop) AS amount
-                                          FROM fm_ecobilag
-                                        GROUP BY fm_ecobilag.pmwrkord_code, 
fm_ecobilag.periode) orders_paid_or_pending';
+                                                 SELECT 
fm_ecobilag.pmwrkord_code AS order_id, fm_ecobilag.periode, 
sum(fm_ecobilag.godkjentbelop) AS amount, fm_ecobilag.periodization, 
fm_ecobilag.periodization_start
+                                                  FROM fm_ecobilag
+                                                  GROUP BY 
fm_ecobilag.pmwrkord_code, fm_ecobilag.periode, fm_ecobilag.periodization, 
fm_ecobilag.periodization_start) orders_paid_or_pending ORDER BY 
orders_paid_or_pending.periode, orders_paid_or_pending.order_id';
 
                                
$GLOBALS['phpgw_setup']->oProc->query($sql,__LINE__,__FILE__);
                                break;

Modified: branches/Version-1_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/setup.inc.php    2014-02-03 
13:30:43 UTC (rev 11655)
+++ branches/Version-1_0-branch/property/setup/setup.inc.php    2014-02-03 
17:14:15 UTC (rev 11656)
@@ -12,7 +12,7 @@
        */
 
        $setup_info['property']['name']                 = 'property';
-       $setup_info['property']['version']              = '0.9.17.676';
+       $setup_info['property']['version']              = '0.9.17.677';
        $setup_info['property']['app_order']    = 8;
        $setup_info['property']['enable']               = 1;
        $setup_info['property']['app_group']    = 'office';

Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php    
2014-02-03 13:30:43 UTC (rev 11655)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php    
2014-02-03 17:14:15 UTC (rev 11656)
@@ -7864,3 +7864,35 @@
                        return $GLOBALS['setup_info']['property']['currentver'];
                }
        }
+       
+       /**
+       * Update property version from 0.9.17.676 to 0.9.17.677
+       * Add fields to view
+       */
+
+       $test[] = '0.9.17.676';
+       function property_upgrade0_9_17_676()
+       {
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+               $GLOBALS['phpgw_setup']->oProc->query("DELETE FROM fm_cache");
+
+               $sql = 'CREATE OR REPLACE VIEW fm_orders_paid_or_pending_view 
AS 
+                SELECT orders_paid_or_pending.order_id, 
orders_paid_or_pending.periode,orders_paid_or_pending.amount,orders_paid_or_pending.periodization,
 orders_paid_or_pending.periodization_start
+                  FROM ( SELECT fm_ecobilagoverf.pmwrkord_code AS order_id, 
fm_ecobilagoverf.periode, sum(fm_ecobilagoverf.godkjentbelop) AS amount, 
fm_ecobilagoverf.periodization, fm_ecobilagoverf.periodization_start
+                              FROM fm_ecobilagoverf
+                              GROUP BY fm_ecobilagoverf.pmwrkord_code, 
fm_ecobilagoverf.periode, fm_ecobilagoverf.periodization, 
fm_ecobilagoverf.periodization_start
+                               UNION ALL 
+                             SELECT fm_ecobilag.pmwrkord_code AS order_id, 
fm_ecobilag.periode, sum(fm_ecobilag.godkjentbelop) AS amount, 
fm_ecobilag.periodization, fm_ecobilag.periodization_start
+                              FROM fm_ecobilag
+                              GROUP BY fm_ecobilag.pmwrkord_code, 
fm_ecobilag.periode, fm_ecobilag.periodization, 
fm_ecobilag.periodization_start) orders_paid_or_pending ORDER BY 
orders_paid_or_pending.periode, orders_paid_or_pending.order_id';
+
+               $GLOBALS['phpgw_setup']->oProc->query($sql,__LINE__,__FILE__);
+
+               if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+               {
+                       $GLOBALS['setup_info']['property']['currentver'] = 
'0.9.17.677';
+                       return $GLOBALS['setup_info']['property']['currentver'];
+               }
+       }
+
[Prev in Thread]
Current Thread
[Next in Thread]
[Fmsystem-commits] [11656] Merge 11643:11655 from trunk, Sigurd Nes <=
Prev by Date: [Fmsystem-commits] [11655] property: update view
Next by Date: [Fmsystem-commits] [11657] property: cron job - integration
Previous by thread: [Fmsystem-commits] [11655] property: update view
Next by thread: [Fmsystem-commits] [11657] property: cron job - integration
Index(es):
- Date
- Thread