diff -bBNur --exclude=WS_FTP.LOG --exclude=CVS --exclude=.git /srv/ocs.judith.makina-nantes.net/www/htdocs/source/.gitignore /home/kiorky/projects/mc/MASTERCARD/iso/xampp_ocs/htdocs/source/.gitignore--- /srv/ocs.judith.makina-nantes.net/www/htdocs/source/.gitignore 2010-01-05 11:36:58.000000000 +0100+++ /home/kiorky/projects/mc/MASTERCARD/iso/xampp_ocs/htdocs/source/.gitignore 1970-01-01 01:00:00.000000000 +0100@@ -1,4 +0,0 @@-CSV-CVS-.buildpath
-.project\ No newline at end of filediff -bBNur --exclude=WS_FTP.LOG --exclude=CVS --exclude=.git /srv/ocs.judith.makina-nantes.net/www/htdocs/source/backend/mode_dev.php /home/kiorky/projects/mc/MASTERCARD/iso/xampp_ocs/htdocs/source/backend/mode_dev.php--- /srv/ocs.judith.makina-nantes.net/www/htdocs/source/backend/mode_dev.php 2010-01-05 14:48:21.000000000 +0100+++ /home/kiorky/projects/mc/MASTERCARD/iso/xampp_ocs/htdocs/source/backend/mode_dev.php 1970-01-01 01:00:00.000000000 +0100@@ -1,58 +0,0 @@-<?php
-<?php
-
-// Copyright (C) 2010, Mathieu PASQUET <mpa@makina-corpus.com>
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the <ORGANIZATION> nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-// Include prepend.inc to load Qcodo
-require('../includes/prepend.inc.php'); /* if you DO NOT have "includes/" in your include_path */
-// require('prepend.inc.php'); /* if you DO have "includes/" in your include_path */
-
-// Include the classfile for DomainEditFormBase
-require(__FORMBASE_CLASSES__ . '/DomainEditFormBase.class.php');
-
-// Security check for ALLOW_REMOTE_ADMIN
-// To allow access REGARDLESS of ALLOW_REMOTE_ADMIN, simply remove the line below
-QApplication::CheckRemoteAdmin();
-
-
-class SampleForm extends QForm {
-
- protected function Form_Create() {
-
-
- }
-
-}
-ob_start();
-
-SampleForm::Run('SampleForm');
-$html=ob_get_contents();
-ob_end_clean();
-
-
-?>
diff -bBNur --exclude=WS_FTP.LOG --exclude=CVS --exclude=.git /srv/ocs.judith.makina-nantes.net/www/htdocs/source/backend/templates/mode_dev.tpl.php /home/kiorky/projects/mc/MASTERCARD/iso/xampp_ocs/htdocs/source/backend/templates/mode_dev.tpl.php--- /srv/ocs.judith.makina-nantes.net/www/htdocs/source/backend/templates/mode_dev.tpl.php 2010-01-05 14:50:06.000000000 +0100+++ /home/kiorky/projects/mc/MASTERCARD/iso/xampp_ocs/htdocs/source/backend/templates/mode_dev.tpl.php 1970-01-01 01:00:00.000000000 +0100@@ -1,22 +0,0 @@-<?php
- // This is the HTML template include file (.tpl.php) for the access_edit.php
- // form DRAFT page. Remember that this is a DRAFT. It is MEANT to be altered/modified.
- // Be sure to move this out of the generated/ subdirectory before modifying to ensure that subsequent
- // code re-generations do not overwrite your changes.
-
- $strPageTitle = 'Edit/Create domain';
- require(__INCLUDES__ . '/headerbackend.inc.php')
-?>
-
- <?php $this->RenderBegin() ?>
- <h3><?php _p($this->strTitleVerb); ?><?php _t('Domain')?></h3>
- <br />
- <?php $this->btnSave->Render() ?>
-
- <?php $this->btnCancel->Render() ?>
-
- <?php $this->btnDelete->Render() ?>
-
- <?php $this->RenderEnd() ?>
-
-<?php require(__INCLUDES__ .'/footerbackend.inc.php'); ?>
diff -bBNur --exclude=WS_FTP.LOG --exclude=CVS --exclude=.git /srv/ocs.judith.makina-nantes.net/www/htdocs/source/includes/configuration.inc.php /home/kiorky/projects/mc/MASTERCARD/iso/xampp_ocs/htdocs/source/includes/configuration.inc.php--- /srv/ocs.judith.makina-nantes.net/www/htdocs/source/includes/configuration.inc.php 2010-01-05 11:42:20.000000000 +0100+++ /home/kiorky/projects/mc/MASTERCARD/iso/xampp_ocs/htdocs/source/includes/configuration.inc.php 2009-02-19 10:30:00.000000000 +0100@@ -11,8 +11,7 @@ define('__SHOWEMAILOPTIONS__', true);
define('__ENABLECAPTHCA__', true);
define('ALLOW_REMOTE_ADMIN', true);
- define ('__DOCROOT__', '/srv/ocs.judith.makina-nantes.net/www/htdocs/source/');
- define ('__QCODO__TMP_PATH__', '/srv/ocs.judith.makina-nantes.net/www/var/tmp/');
+ define ('__DOCROOT__', 'c:/xampp_ocs/htdocs/source');
define ('__VIRTUAL_DIRECTORY__', '/' . $path[1]);
define ('__SUBDIRECTORY__', '');
@@ -46,17 +45,17 @@ define('DB_CONNECTION_1', serialize(array(
'adapter' => 'MySqli',
- 'server' => '127.0.0.1',
- 'port' => 3310,
+ 'server' => 'localhost',
+ 'port' => null,
'database' => 'ocs_' . $path[1],
'username' => 'root',
- 'password' => 'secret',
+ 'password' => '',
'encoding' => 'utf8',
'profiling' => false)));
define('DB_CONNECTION_2', serialize(array(
'adapter' => 'MySqli',
- 'server' => 'elsewhere',
+ 'server' => 'localhost',
'port' => null,
'database' => 'ocs_lsp',
'username' => 'root',
diff -bBNur --exclude=WS_FTP.LOG --exclude=CVS --exclude=.git /srv/ocs.judith.makina-nantes.net/www/htdocs/source/includes/qcodo/_core/qform_state_handlers/QFileFormStateHandler.class.php /home/kiorky/projects/mc/MASTERCARD/iso/xampp_ocs/htdocs/source/includes/qcodo/_core/qform_state_handlers/QFileFormStateHandler.class.php--- /srv/ocs.judith.makina-nantes.net/www/htdocs/source/includes/qcodo/_core/qform_state_handlers/QFileFormStateHandler.class.php 2010-01-05 11:42:20.000000000 +0100+++ /home/kiorky/projects/mc/MASTERCARD/iso/xampp_ocs/htdocs/source/includes/qcodo/_core/qform_state_handlers/QFileFormStateHandler.class.php 2009-01-06 20:46:00.000000000 +0100@@ -20,7 +20,7 @@ *
* @var string StatePath
*/
- public static $StatePath = __QCODO__TMP_PATH__;
+ public static $StatePath = 'c:/xampp_ocs/tmp';
/**
* The filename prefix to be used by all FormState files