[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7934] Merge 7926:7933 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7934] Merge 7926:7933 from trunk |
|
Date: |
Tue, 25 Oct 2011 07:12:52 +0000 |
Revision: 7934
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7934
Author: sigurdne
Date: 2011-10-25 07:12:50 +0000 (Tue, 25 Oct 2011)
Log Message:
-----------
Merge 7926:7933 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/booking/inc/class.boaccount_code_set.inc.php
branches/Version-1_0-branch/booking/inc/class.sodocumentation.inc.php
branches/Version-1_0-branch/booking/inc/class.soseason.inc.php
branches/Version-1_0-branch/booking/inc/class.uievent.inc.php
branches/Version-1_0-branch/booking/setup/phpgw_no.lang
branches/Version-1_0-branch/booking/templates/base/application_new.xsl
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
branches/Version-1_0-branch/property/inc/export/default/Basware_X114
Property Changed:
----------------
branches/Version-1_0-branch/
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
+
/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
Modified:
branches/Version-1_0-branch/booking/inc/class.boaccount_code_set.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.boaccount_code_set.inc.php
2011-10-24 18:23:59 UTC (rev 7933)
+++ branches/Version-1_0-branch/booking/inc/class.boaccount_code_set.inc.php
2011-10-25 07:12:50 UTC (rev 7934)
@@ -8,4 +8,46 @@
parent::__construct();
$this->so = CreateObject('booking.soaccount_code_set');
}
- }
\ No newline at end of file
+
+ protected function get_object_role_permissions(array
$forObject, $defaultPermissions)
+ {
+ return array_merge(
+ array
+ (
+ booking_sopermission::ROLE_MANAGER =>
array
+ (
+ 'write' => true,
+ ),
+ 'global' => array
+ (
+
booking_sopermission::ROLE_MANAGER => array
+ (
+ 'read' => true,
+ 'write' => true,
+ 'create' => true,
+ 'delete' => true,
+ ),
+ )
+ ),
+ $defaultPermissions
+ );
+ }
+
+ protected function
get_collection_role_permissions($defaultPermissions)
+ {
+ return array_merge(
+ array(
+ 'global' => array
+ (
+
booking_sopermission::ROLE_MANAGER => array
+ (
+ 'create' => true,
#means that this role may create new objects of the present type
+ 'delete' => true,
+ ),
+ ),
+ ),
+ $defaultPermissions
+ );
+ }
+
+ }
Modified: branches/Version-1_0-branch/booking/inc/class.sodocumentation.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.sodocumentation.inc.php
2011-10-24 18:23:59 UTC (rev 7933)
+++ branches/Version-1_0-branch/booking/inc/class.sodocumentation.inc.php
2011-10-25 07:12:50 UTC (rev 7934)
@@ -175,6 +175,17 @@
return (false === $pos = strrpos($entity['name'], '.'))
? false : substr($entity['name'], $pos+1);
}
+ public function getMyRole($id) {
+
+ $db = $this->db;
+ $db->limit_query("SELECT role FROM bb_permission_root
WHERE id=".intval($GLOBALS['phpgw_info']['user']['account_id']), 0, __LINE__,
__FILE__, 1);
+ if($db->next_record())
+ {
+ return $db->f('role', false);
+ }
+ return false;
+ }
+
public function getFrontendDoc()
{
$this->db->query("SELECT id,name FROM
bb_documentation WHERE category='frontend' ORDER BY id DESC", __LINE__,
__FILE__);
Modified: branches/Version-1_0-branch/booking/inc/class.soseason.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.soseason.inc.php
2011-10-24 18:23:59 UTC (rev 7933)
+++ branches/Version-1_0-branch/booking/inc/class.soseason.inc.php
2011-10-25 07:12:50 UTC (rev 7934)
@@ -14,7 +14,7 @@
'active' => array('type'
=> 'int', 'required' => true),
'building_id' => array('type' =>
'int', 'required' => true),
'name' => array('type'
=> 'string', 'query' => true, 'required' => true),
- 'status' => array('type'
=> 'string', 'required'=> true),
+ 'status' => array('type'
=> 'string', 'query' => true, 'required'=> true),
'from_' => array('type' =>
'date', 'required'=> true),
'to_' => array('type' =>
'date', 'required'=> true),
'building_name' => array('type' =>
'string',
Modified: branches/Version-1_0-branch/booking/inc/class.uievent.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.uievent.inc.php
2011-10-24 18:23:59 UTC (rev 7933)
+++ branches/Version-1_0-branch/booking/inc/class.uievent.inc.php
2011-10-25 07:12:50 UTC (rev 7934)
@@ -533,7 +533,7 @@
}
if(!$errors['event'] and
!$errors['resource_number'] and !$errors['organization_number'] and
!$errors['invoice_data'] && !$errors['contact_name'] && !$errors['cost'])
- {
+ {
if (phpgw::get_var('mail', 'POST') ||
phpgw::get_var('sendtorbuilding', 'POST'))
{
if(phpgw::get_var('sendtocollision', 'POST') || phpgw::get_var('sendtocontact',
'POST') || phpgw::get_var('sendtorbuilding', 'POST'))
@@ -621,12 +621,44 @@
}
}
- }
- else
- {
- $this->add_comment($event,
phpgw::get_var('mail', 'POST'));
-
$this->send_mailnotification($event['contact_email'], lang('Event changed'),
phpgw::get_var('mail', 'POST'));
+ } else {
+
$this->add_comment($event, phpgw::get_var('mail', 'POST'));
+
$this->send_mailnotification($event['contact_email'], lang('Event changed'),
phpgw::get_var('mail', 'POST'));
}
+ } elseif (!phpgw::get_var('active',
'POST')) {
+ if
($event['customer_organization_name']) {
+
$comment_text_log = $event['customer_organization_name'];
+ } else {
+
$comment_text_log = $event['contact_name'];
+ }
+
$comment_text_log = $comment_text_log.' sitt arrangement i
'.$event['building_name'].' '.date('d-m-Y H:i', strtotime($event['from_']))."
har blitt kansellert.\n For mer opplysinger slå opp i AktivBy.";
+//
$comment_text_log = phpgw::get_var('mail', 'POST');
+ $sendt = 0;
+ $mail_sendt_to
= '';
+
if($building_info['email']) {
+
$sendt++;
+
$mail_sendt_to = $mail_sendt_to.' '.$building_info['email'];
+
$this->send_mailnotification($building_info['email'], lang('Event changed'),
$comment_text_log);
+ }
+ if
($_POST['sendtorbuilding_email1']) {
+
$sendt++;
+
$mail_sendt_to = $mail_sendt_to.' '.$_POST['sendtorbuilding_email1'];
+
$this->send_mailnotification($_POST['sendtorbuilding_email1'], lang('Event
changed'), $comment_text_log);
+
+ }
+ if
($_POST['sendtorbuilding_email2']) {
+
$sendt++;
+
$mail_sendt_to = $mail_sendt_to.' '.$_POST['sendtorbuilding_email2'];
+
$this->send_mailnotification($_POST['sendtorbuilding_email2'], lang('Event
changed'), $comment_text_log);
+ }
+ if ($sendt > 0)
{
+
$errors['mailtobuilding'] = lang('Unable to send warning, No mailadresses
found');
+ }
+ else
+ {
+
$comment = $comment_text_log.'. Denne er sendt til '.$mail_sendt_to;
+
$this->add_comment($event,$comment);
+ }
}
$receipt = $this->bo->update($event);
$this->redirect(array('menuaction' =>
'booking.uievent.edit', 'id'=>$event['id']));
Modified: branches/Version-1_0-branch/booking/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2011-10-24
18:23:59 UTC (rev 7933)
+++ branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2011-10-25
07:12:50 UTC (rev 7934)
@@ -417,8 +417,8 @@
export_configurations[external][account_code_set_id] booking no Velg
eksterne kontokoder
export_configurations[internal][account_code_set_id] booking no Velg
interne kontokoder
new target audience booking no Ny målgruppe
-Information about the event booking no Informasjon om arrangementet
-Short description. For public events, activities and training under the
direction of organizations and clubs, this information will be displayed on the
internet booking no Gi en kort beskrivelse av arrangementet. For
åpne arrangement, aktiviteter og trening i regi av organisasjoner og klubber
vises denne informasjonen på internett
+Information about the event booking no Informasjon om
aktiviteten/arrangementet
+Short description. For public events, activities and training under the
direction of organizations and clubs, this information will be displayed on the
internet booking no Gi en kort beskrivelse av arrangementet
/aktiviteten. For åpne arrangement, aktiviteter og trening i regi av
organisasjoner og klubber vises denne informasjonen på internett. For faste
aktiviteter oppgi intervall og til dato, f.eks. torsdager kl.19-20 frem til
23/6.
To borrow premises you must verify that you have read terms and conditions
booking no For å låne lokaler må du bekrefte at du har lest juridiske
betingelser
In order to send the invoice we need information about either customer
organization number or norwegian social security number booking no For å
kunne sende faktura trenger vi opplysninger om organisasjonsnr. eller
fødselsnr. Interne fra BK oppgir ressursnr. Organisasjonsnr. finner du her:
www.brreg.no
Event type booking no Arrangementstype
Modified: branches/Version-1_0-branch/booking/templates/base/application_new.xsl
===================================================================
--- branches/Version-1_0-branch/booking/templates/base/application_new.xsl
2011-10-24 18:23:59 UTC (rev 7933)
+++ branches/Version-1_0-branch/booking/templates/base/application_new.xsl
2011-10-25 07:12:50 UTC (rev 7934)
@@ -16,12 +16,6 @@
<div class="heading">1. <xsl:value-of
select="php:function('lang', 'Why?')" /></div>
<dt>
<label for="field_activity"><xsl:value-of
select="php:function('lang', 'Activity')" /></label>
- <p>Informasjon om aktiviteten/arrangementet
- Gi en kort beskrivelse av arrangementet
/aktiviteten.
- For åpne arrangement, aktiviteter og trening i
regi av
- organisasjoner og klubber vises denne
informasjonen på internett.
- For faste aktiviteter oppgi intervall og til
dato,
- f.eks. torsdager kl.19-20 frem til 23/6. Oppgi
arrangør og gi en kort beskrivelse av arrangementet. For åpne arrangement,
aktiviteter og trening i regi av organisasjoner og klubber vises denne
informasjonen på internett</p>
</dt>
<dd>
<select name="activity_id" id="field_activity">
Modified:
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
===================================================================
---
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
2011-10-24 18:23:59 UTC (rev 7933)
+++
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
2011-10-25 07:12:50 UTC (rev 7934)
@@ -253,7 +253,7 @@
$sftp = @ssh2_sftp($connection);
// Scan directory
- $arr = array();
+ $files = array();
echo "Scanning
{$directory_remote}<br/>";
$dir =
"ssh2.sftp://$sftp$directory_remote";;
$handle = opendir($dir);
@@ -273,24 +273,31 @@
@fclose($stream);
echo "CONTENTS:
$contents<br/><br/>";
*/
- $arr[] = $file;
+ $files[] = $file;
}
if ($this->debug)
{
- _debug_array($arr);
+ _debug_array($files);
}
else
{
- $total_files=count($arr);
- for($i=0;$i<$total_files;$i++)
+ foreach($files as $file_name)
{
-
$file_name=trim($arr[$i]);
- if($file_name!='' &&
stripos( $file_name, 'x205' ) === 0)
+ if( stripos(
$file_name, 'x205' ) === 0)
{
+ //
_debug_array($file_name);
$file_remote =
"{$directory_remote}/{$file_name}";
$file_local =
"{$directory_local}/{$file_name}";
-
if(ssh2_scp_recv($connection, $file_remote,$file_local))
+
+ $stream =
fopen("ssh2.sftp://$sftp$file_remote";, 'r');
+ $contents =
fread($stream, filesize("ssh2.sftp://$sftp$file_remote";));
+ fclose($stream);
+
+ $fp =
fopen($file_local, "wb");
+
fwrite($fp,$contents);
+
+ if(fclose($fp))
{
echo
"File remote: ".$file_remote." was copied to local: $file_local<br/>";
if(
ssh2_sftp_rename ($sftp, $file_remote,
"{$directory_remote}/archive/{$file_name}" ))
Modified: branches/Version-1_0-branch/property/inc/export/default/Basware_X114
===================================================================
--- branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2011-10-24 18:23:59 UTC (rev 7933)
+++ branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2011-10-25 07:12:50 UTC (rev 7934)
@@ -873,11 +873,14 @@
$transfer_ok =
ftp_put($connection,$remote_file, $Filnavn, FTP_BINARY);
break;
case 'ssh';
- $transfer_ok =
ssh2_scp_send($connection, $Filnavn, $remote_file );
+ $sftp = ssh2_sftp($connection);
+ $stream =
@fopen("ssh2.sftp://$sftp$remote_file";, 'w');
+ $data_to_send =
@file_get_contents($Filnavn);
+ fwrite($stream, $data_to_send);
+ $transfer_ok = @fclose($stream);
break;
default:
$transfer_ok = false;
-
}
if ($send_ok)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7934] Merge 7926:7933 from trunk,
Sigurd Nes <=