[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13400] Syncromind: Merge 13346:13399 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [13400] Syncromind: Merge 13346:13399 from trunk |
|
Date: |
Wed, 10 Jun 2015 12:32:15 +0000 |
Revision: 13400
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13400
Author: sigurdne
Date: 2015-06-10 12:32:10 +0000 (Wed, 10 Jun 2015)
Log Message:
-----------
Syncromind: Merge 13346:13399 from trunk
Modified Paths:
--------------
branches/dev-syncromind/activitycalendar/setup/setup.inc.php
branches/dev-syncromind/activitycalendarfrontend/setup/setup.inc.php
branches/dev-syncromind/admin/inc/class.ui_custom.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.bosearch.inc.php
branches/dev-syncromind/bookingfrontend/setup/setup.inc.php
branches/dev-syncromind/controller/inc/class.hook_helper.inc.php
branches/dev-syncromind/frontend/inc/class.uicontract_documents.inc.php
branches/dev-syncromind/home.php
branches/dev-syncromind/phpgwapi/cron/stalesessions.php
branches/dev-syncromind/phpgwapi/inc/auth/class.auth_ads.inc.php
branches/dev-syncromind/phpgwapi/inc/class.Mail_mimeDecode.inc.php
branches/dev-syncromind/phpgwapi/inc/class.Services_JSON.inc.php
branches/dev-syncromind/phpgwapi/inc/class.Template.inc.php
branches/dev-syncromind/phpgwapi/inc/class.arrayfunctions.inc.php
branches/dev-syncromind/phpgwapi/inc/class.calendar_holidays.inc.php
branches/dev-syncromind/phpgwapi/inc/class.contact_types.inc.php
branches/dev-syncromind/phpgwapi/inc/class.country.inc.php
branches/dev-syncromind/phpgwapi/inc/class.csstooltip.inc.php
branches/dev-syncromind/phpgwapi/inc/class.custom_functions.inc.php
branches/dev-syncromind/phpgwapi/inc/class.data_cleaner.inc.php
branches/dev-syncromind/phpgwapi/inc/class.excel.inc.php
branches/dev-syncromind/phpgwapi/inc/class.gdgraph.inc.php
branches/dev-syncromind/phpgwapi/inc/class.gdimage.inc.php
branches/dev-syncromind/phpgwapi/inc/class.html2text.inc.php
branches/dev-syncromind/phpgwapi/inc/class.http_svn_client.inc.php
branches/dev-syncromind/phpgwapi/inc/class.interserver.inc.php
branches/dev-syncromind/phpgwapi/inc/class.ipc_manager.inc.php
branches/dev-syncromind/phpgwapi/inc/class.locations.inc.php
branches/dev-syncromind/phpgwapi/inc/class.mail2array.inc.php
branches/dev-syncromind/phpgwapi/inc/class.mail_handlers.inc.php
branches/dev-syncromind/phpgwapi/inc/class.matrixview.inc.php
branches/dev-syncromind/phpgwapi/inc/class.net_http_client.inc.php
branches/dev-syncromind/phpgwapi/inc/class.network.inc.php
branches/dev-syncromind/phpgwapi/inc/class.nextmatchs_xslt.inc.php
branches/dev-syncromind/phpgwapi/inc/class.preferences.inc.php
branches/dev-syncromind/phpgwapi/inc/class.rssparser.inc.php
branches/dev-syncromind/phpgwapi/inc/class.schema_proc.inc.php
branches/dev-syncromind/phpgwapi/inc/class.schema_proc_array.inc.php
branches/dev-syncromind/phpgwapi/inc/class.schema_proc_mssql.inc.php
branches/dev-syncromind/phpgwapi/inc/class.schema_proc_mysql.inc.php
branches/dev-syncromind/phpgwapi/inc/class.schema_proc_oracle.inc.php
branches/dev-syncromind/phpgwapi/inc/class.schema_proc_pgsql.inc.php
branches/dev-syncromind/phpgwapi/inc/class.schema_proc_sapdb.inc.php
branches/dev-syncromind/phpgwapi/inc/class.service.inc.php
branches/dev-syncromind/phpgwapi/inc/class.service_contacts.inc.php
branches/dev-syncromind/phpgwapi/inc/class.service_notes.inc.php
branches/dev-syncromind/phpgwapi/inc/class.service_schedule.inc.php
branches/dev-syncromind/phpgwapi/inc/class.setup.inc.php
branches/dev-syncromind/phpgwapi/inc/class.setup_detection.inc.php
branches/dev-syncromind/phpgwapi/inc/class.sql.inc.php
branches/dev-syncromind/phpgwapi/inc/class.ui_tools.inc.php
branches/dev-syncromind/phpgwapi/inc/class.uijsaddressbook.inc.php
branches/dev-syncromind/phpgwapi/inc/class.utilities.inc.php
branches/dev-syncromind/phpgwapi/inc/class.validator.inc.php
branches/dev-syncromind/phpgwapi/inc/class.vcard.inc.php
branches/dev-syncromind/phpgwapi/inc/class.vfs_dav.inc.php
branches/dev-syncromind/phpgwapi/inc/class.vfs_shared.inc.php
branches/dev-syncromind/phpgwapi/inc/class.xml.inc.php
branches/dev-syncromind/phpgwapi/inc/excel/BIFFwriter.php
branches/dev-syncromind/phpgwapi/inc/excel/Format.php
branches/dev-syncromind/phpgwapi/inc/excel/Workbook.php
branches/dev-syncromind/phpgwapi/inc/excel/Worksheet.php
branches/dev-syncromind/phpgwapi/inc/excel/test.php
branches/dev-syncromind/phpgwapi/inc/exchange/class_http.php
branches/dev-syncromind/phpgwapi/inc/exchange/class_xml.php
branches/dev-syncromind/phpgwapi/inc/exchange/example_xml.php
branches/dev-syncromind/phpgwapi/inc/exchange/image_cache.php
branches/dev-syncromind/phpgwapi/inc/geshi/geshi/actionscript.php
branches/dev-syncromind/phpgwapi/inc/geshi/geshi/ada.php
branches/dev-syncromind/phpgwapi/inc/geshi/geshi/apache.php
branches/dev-syncromind/phpgwapi/inc/geshi/geshi/applescript.php
branches/dev-syncromind/phpgwapi/inc/geshi/geshi/asm.php
branches/dev-syncromind/phpgwapi/inc/geshi/geshi/bash.php
branches/dev-syncromind/phpgwapi/inc/geshi/geshi/blitzbasic.php
branches/dev-syncromind/phpgwapi/inc/geshi/geshi/c.php
branches/dev-syncromind/phpgwapi/inc/geshi/geshi/c_mac.php
branches/dev-syncromind/phpgwapi/inc/geshi/geshi/caddcl.php
branches/dev-syncromind/phpgwapi/inc/geshi/geshi/cadlisp.php
branches/dev-syncromind/phpgwapi/inc/geshi/geshi/cfdg.php
branches/dev-syncromind/phpgwapi/inc/geshi/geshi/cfm.php
branches/dev-syncromind/phpgwapi/inc/geshi/geshi/cpp.php
branches/dev-syncromind/phpgwapi/inc/geshi/geshi/csharp.php
branches/dev-syncromind/phpgwapi/inc/geshi/geshi/css.php
branches/dev-syncromind/phpgwapi/inc/log_functions.inc.php
branches/dev-syncromind/phpgwapi/inc/mapping/class.mapping_.inc.php
branches/dev-syncromind/phpgwapi/inc/mapping/class.mapping_ldap.inc.php
branches/dev-syncromind/phpgwapi/inc/mapping/class.mapping_sql.inc.php
branches/dev-syncromind/phpgwapi/inc/pclzip/pclzip.lib.php
branches/dev-syncromind/phpgwapi/inc/soaplib.soapinterop.php
branches/dev-syncromind/phpgwapi/inc/yui-combo-master/combo.php
branches/dev-syncromind/phpgwapi/inc/yui-combo-master/lib/YUICombo.php
branches/dev-syncromind/phpgwapi/inc/yui-combo-master/lib/YUIFileUtil.php
branches/dev-syncromind/phpgwapi/inc/yui-combo-master/lib/YUIHeaderUtil.php
branches/dev-syncromind/phpgwapi/inc/yui-combo-master/settings.php
branches/dev-syncromind/phpgwapi/setup/tables_baseline.inc.php
branches/dev-syncromind/phpgwapi/setup/test_data.inc.php
branches/dev-syncromind/phpgwapi/templates/desktop/head.inc.php
branches/dev-syncromind/phpgwapi/templates/idsociety/head.inc.php
branches/dev-syncromind/phpgwapi/templates/linux-at-work.de/head.inc.php
branches/dev-syncromind/phpgwapi/templates/portico/css/base.css
branches/dev-syncromind/phpgwapi/templates/probusiness/head.inc.php
branches/dev-syncromind/phpgwapi/templates/simple/head.inc.php
branches/dev-syncromind/phpsysinfo/setup/setup.inc.php
branches/dev-syncromind/preferences/inc/class.boadmin_acl.inc.php
branches/dev-syncromind/property/inc/class.hook_helper.inc.php
branches/dev-syncromind/property/inc/class.sotts.inc.php
branches/dev-syncromind/property/inc/hook_settings.inc.php
branches/dev-syncromind/rental/inc/class.menu.inc.php
branches/dev-syncromind/rental/inc/class.socontract.inc.php
branches/dev-syncromind/rental/inc/class.socontract_price_item.inc.php
branches/dev-syncromind/rental/inc/class.uicontract.inc.php
branches/dev-syncromind/rental/inc/hook_config.inc.php
branches/dev-syncromind/rental/inc/model/class.contract.inc.php
branches/dev-syncromind/rental/setup/default_records.inc.php
branches/dev-syncromind/rental/setup/setup.inc.php
branches/dev-syncromind/rental/setup/tables_update.inc.php
branches/dev-syncromind/rental/templates/base/config.tpl
branches/dev-syncromind/rental/templates/base/contract.php
branches/dev-syncromind/set_box.php
branches/dev-syncromind/setup/applications.php
branches/dev-syncromind/setup/applist.php
branches/dev-syncromind/setup/bulk.php
branches/dev-syncromind/setup/config.php
branches/dev-syncromind/setup/index.php
branches/dev-syncromind/setup/ldap.php
branches/dev-syncromind/setup/ldapexport.php
branches/dev-syncromind/setup/ldapimport.php
branches/dev-syncromind/setup/ldapmodify.php
branches/dev-syncromind/setup/schematoy.php
branches/dev-syncromind/setup/sqltoarray.php
Added Paths:
-----------
branches/dev-syncromind/rental/inc/class.hook_helper.inc.php
branches/dev-syncromind/rental/inc/custom/
Property Changed:
----------------
branches/dev-syncromind/
branches/dev-syncromind/bookingfrontend/
Property changes on: branches/dev-syncromind
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/stavangerkommune:12743-12875,12986
/trunk:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987,12989-13177,13179-13344
+ /branches/stavangerkommune:12743-12875,12986
/trunk:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987,12989-13177,13179-13344,13346-13399
Modified: branches/dev-syncromind/activitycalendar/setup/setup.inc.php
===================================================================
--- branches/dev-syncromind/activitycalendar/setup/setup.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/activitycalendar/setup/setup.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -30,7 +30,7 @@
$setup_info['activitycalendar']['depends'][] = array(
'appname' => 'booking',
- 'versions' =>
array('0.2.05','0.2.06','0.2.07','0.2.08','0.2.09','0.2.10', '0.2.11','0.2.12')
+ 'versions' => array('0.2.20')
);
$setup_info['activitycalendar']['depends'][] = array(
Modified: branches/dev-syncromind/activitycalendarfrontend/setup/setup.inc.php
===================================================================
--- branches/dev-syncromind/activitycalendarfrontend/setup/setup.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/activitycalendarfrontend/setup/setup.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -22,7 +22,7 @@
$setup_info['activitycalendarfrontend']['depends'][] = array(
'appname' => 'booking',
- 'versions' => Array('0.2.00', '0.2.01', '0.2.02', '0.2.03', '0.2.04',
'0.2.05', '0.2.06', '0.2.07', '0.2.08', '0.2.09', '0.2.10', '0.2.11','0.2.12')
+ 'versions' => Array('0.2.20')
);
$setup_info['activitycalendarfrontend']['depends'][] = array(
@@ -32,7 +32,7 @@
$setup_info['activitycalendarfrontend']['depends'][] = array(
'appname' => 'activitycalendar',
- 'versions' => Array('0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8',
'0.1.9', '0.1.10', '0.1.11')
+ 'versions' => Array('0.1.11')
);
/* The hooks this app includes, needed for hooks registration */
Modified: branches/dev-syncromind/admin/inc/class.ui_custom.inc.php
===================================================================
--- branches/dev-syncromind/admin/inc/class.ui_custom.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/admin/inc/class.ui_custom.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -620,7 +620,7 @@
'lang_no_location'
=> lang('No location'),
'lang_location_statustext'
=> lang('Select submodule'),
'select_name_location'
=> 'location',
- 'location_list'
=>
$this->bolocation->select_location('filter',$location,False,True),
+ 'location_list'
=> $this->bolocation->select_location('filter',
$location, false, false, true),
);
Property changes on: branches/dev-syncromind/bookingfrontend
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/stavangerkommune/bookingfrontend:9468-12740,12743-12875,12986
/trunk/bookingfrontend:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987
+ /branches/stavangerkommune/bookingfrontend:9468-12740,12743-12875,12986
/trunk/bookingfrontend:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987,13346-13399
Modified: branches/dev-syncromind/bookingfrontend/inc/class.bosearch.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.bosearch.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/bookingfrontend/inc/class.bosearch.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -14,10 +14,19 @@
function search($searchterm)
{
- $type = phpgw::get_var('type', 'GET');
- $bui_result = $org_result = $res_result = array();
+ if($type = phpgw::get_var('type', 'GET'))
+ {
+ $types = array($type);
+ }
+ else
+ {
+ $types = array('building','resource'); //default
+ }
- if (!$type || $type == "building") {
+ $bui_result = $org_result = $res_result = $event_result
= array();
+
+ if(in_array('building', $types))
+ {
$bui_result =
$this->sobuilding->read(array("query"=>$searchterm, "sort" => "name", "dir" =>
"asc", "filters" => array("active" => "1")));
foreach($bui_result['results'] as &$bui)
{
@@ -31,7 +40,9 @@
}
}
}
- if (!$type || $type == "organization") {
+
+ if(in_array('organization', $types))
+ {
$org_result =
$this->soorganization->read(array("query"=>$searchterm, "sort" => "name",
"dir" => "asc", "filters" => array("active" => "1")));
foreach($org_result['results'] as &$org)
{
@@ -44,7 +55,9 @@
}
}
}
- if(!$type || $type == "resource") {
+
+ if(in_array('resource', $types))
+ {
$res_result =
$this->soresource->read(array("query"=>$searchterm, "sort" => "name", "dir" =>
"asc", "filters" => array("active" => "1")));
foreach($res_result['results'] as &$res)
{
@@ -56,7 +69,8 @@
}
}
- if(!$type || $type == "event") {
+ if(in_array('event', $types))
+ {
$now = date('Y-m-d');
$expired_conditions = "(bb_event.active != 0
AND bb_event.completed = 0 AND bb_event.from_ > '{$now}' AND
bb_event.description != '')";
$event_result =
$this->soevent->read(array("query"=>$searchterm, "sort" => "name", "dir" =>
"asc", "filters" => array('where' => $expired_conditions)));
Modified: branches/dev-syncromind/bookingfrontend/setup/setup.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/setup/setup.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/bookingfrontend/setup/setup.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -21,7 +21,7 @@
$setup_info['bookingfrontend']['depends'][] = array(
'appname' => 'booking',
- 'versions' => Array('0.2.10',
'0.2.11','0.2.12','0.2.13','0.2.14','0.2.15','0.2.16','0.2.17','0.2.18','0.2.19','0.2.20')
+ 'versions' => Array('0.2.20')
);
$setup_info['bookingfrontend']['depends'][] = array(
Modified: branches/dev-syncromind/controller/inc/class.hook_helper.inc.php
===================================================================
--- branches/dev-syncromind/controller/inc/class.hook_helper.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/controller/inc/class.hook_helper.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -64,6 +64,11 @@
*/
public function home()
{
+ $app_id =
$GLOBALS['phpgw']->applications->name2id('controller');
+ if( !isset($GLOBALS['portal_order'])
||!in_array($app_id, $GLOBALS['portal_order']) )
+ {
+ $GLOBALS['portal_order'][] = $app_id;
+ }
$location_array = array();
$component_short_desc = array();
Modified:
branches/dev-syncromind/frontend/inc/class.uicontract_documents.inc.php
===================================================================
--- branches/dev-syncromind/frontend/inc/class.uicontract_documents.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/frontend/inc/class.uicontract_documents.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -56,6 +56,7 @@
public function index()
{
+ $org_unit = $this->header_state['selected_org_unit'];
$contractdata = array(); // This is the main container
for all contract data sent to XSLT template stuff
$msglog = array(); // Array of errors and
other notifications displayed to us
@@ -83,9 +84,10 @@
// The current state of the contract view of this user's session
$this->contract_state_doc =
phpgwapi_cache::session_get('frontend', $this->contract_state_identifier_doc);
$new_contract = phpgw::get_var('contract_id');
- $contracts_per_location =
phpgwapi_cache::session_get('frontend',
$this->contracts_per_location_identifier_doc);
+ $contracts_per_location_all =
phpgwapi_cache::session_get('frontend',
$this->contracts_per_location_identifier_doc);
$contracts_for_selection = array();
$number_of_valid_contracts = 0;
+ $contracts_per_location =
$contracts_per_location_all[$org_unit];
foreach($contracts_per_location[$this->header_state['selected_location']] as
$contract)
{
if( ($this->contract_filter_doc == 'active' &&
$contract->is_active()) ||
Modified: branches/dev-syncromind/home.php
===================================================================
--- branches/dev-syncromind/home.php 2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/home.php 2015-06-10 12:32:10 UTC (rev 13400)
@@ -203,7 +203,7 @@
}
$GLOBALS['phpgw']->hooks->process('home', $sorted_apps);
-
+
if ( isset($GLOBALS['portal_order']) &&
is_array($GLOBALS['portal_order']) )
{
$GLOBALS['phpgw']->preferences->delete('portal_order');
@@ -213,12 +213,12 @@
}
$GLOBALS['phpgw']->preferences->save_repository();
}
- if( phpgwapi_cache::system_get('phpgwapi',
'phpgw_home_screen_message'))
- {
- echo "<div class='msg_important'><h2>";
- echo nl2br(phpgwapi_cache::system_get('phpgwapi',
'phpgw_home_screen_message_title'));
- echo "</h2>";
- echo nl2br(phpgwapi_cache::system_get('phpgwapi',
'phpgw_home_screen_message'));
- echo '</div>';
- }
+ if( phpgwapi_cache::system_get('phpgwapi', 'phpgw_home_screen_message'))
+ {
+ echo "<div class='msg_important'><h2>";
+ echo nl2br(phpgwapi_cache::system_get('phpgwapi',
'phpgw_home_screen_message_title'));
+ echo "</h2>";
+ echo nl2br(phpgwapi_cache::system_get('phpgwapi',
'phpgw_home_screen_message'));
+ echo '</div>';
+ }
$GLOBALS['phpgw']->common->phpgw_footer();
Modified: branches/dev-syncromind/phpgwapi/cron/stalesessions.php
===================================================================
--- branches/dev-syncromind/phpgwapi/cron/stalesessions.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/cron/stalesessions.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -26,4 +26,4 @@
// delete old (timed out) sessions
$query = sprintf("delete from phpgw_sessions where session_dla <=
'$purgetime'");
$res = mysql_query($query, $link);
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/auth/class.auth_ads.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/auth/class.auth_ads.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/auth/class.auth_ads.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -66,4 +66,3 @@
return 'CN=Users,'.$this->base_dn;
}
}
-?>
Modified: branches/dev-syncromind/phpgwapi/inc/class.Mail_mimeDecode.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.Mail_mimeDecode.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.Mail_mimeDecode.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -803,4 +803,4 @@
}
} // End of class
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.Services_JSON.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.Services_JSON.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.Services_JSON.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -797,5 +797,4 @@
}
}
-
-?>
+
\ No newline at end of file
Modified: branches/dev-syncromind/phpgwapi/inc/class.Template.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.Template.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.Template.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -1028,4 +1028,3 @@
}
}
-?>
Modified: branches/dev-syncromind/phpgwapi/inc/class.arrayfunctions.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.arrayfunctions.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.arrayfunctions.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -75,4 +75,3 @@
}
}
-?>
Modified: branches/dev-syncromind/phpgwapi/inc/class.calendar_holidays.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.calendar_holidays.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.calendar_holidays.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -566,5 +566,4 @@
$cal_workdays = new calendar_holidays();
$cal_workdays->add_number_of_workdays(31,5,2004,3,'Germany','Lower
Saxony','Evangelic',$day,$month,$year);
echo $year . '-' . $month . '-' . $day . "\n";
- */
-?>
\ No newline at end of file
+ */
\ No newline at end of file
Modified: branches/dev-syncromind/phpgwapi/inc/class.contact_types.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.contact_types.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.contact_types.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -79,4 +79,3 @@
}
}
}
-?>
Modified: branches/dev-syncromind/phpgwapi/inc/class.country.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.country.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.country.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -384,4 +384,3 @@
);
}
}
-?>
Modified: branches/dev-syncromind/phpgwapi/inc/class.csstooltip.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.csstooltip.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.csstooltip.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -131,5 +131,4 @@
{
return '<a href="#"
class="tooltip">'.$link_content.'<span class="tooltip"><span
class="tooltip_headline">'.$tooltip_headline.'</span><span
class="tooltip_line"> </span><span
class="tooltip_content">'.$tooltip_content.'</span></span></a>';
}
- }
-?>
\ No newline at end of file
+ }
\ No newline at end of file
Modified: branches/dev-syncromind/phpgwapi/inc/class.custom_functions.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.custom_functions.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.custom_functions.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -285,10 +285,15 @@
$querymethod = '';
if($query)
{
- $querymethod = " AND file_name {$this->_like}
'%{$query}%'"
- . " OR descr
{$this->_like} '%{$query}%'";
+ $querymethod = " AND (file_name {$this->_like}
'%{$query}%'"
+ . " OR descr
{$this->_like} '%{$query}%')";
}
+ if ( isset($data['pre_commit']) )
+ {
+ $querymethod = " AND pre_commit = 1";
+ }
+
$sql = 'FROM phpgw_cust_function'
. " WHERE location_id = {$location_id}
{$querymethod}";
Modified: branches/dev-syncromind/phpgwapi/inc/class.data_cleaner.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.data_cleaner.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.data_cleaner.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -261,4 +261,3 @@
return $data;
}
}
-?>
Modified: branches/dev-syncromind/phpgwapi/inc/class.excel.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.excel.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.excel.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -42,4 +42,3 @@
* @see workbook
*/
require_once(PHPGW_API_INC . '/excel/Workbook.php');
-?>
Modified: branches/dev-syncromind/phpgwapi/inc/class.gdgraph.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.gdgraph.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.gdgraph.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -853,4 +853,3 @@
return $url;
}
}
-?>
Modified: branches/dev-syncromind/phpgwapi/inc/class.gdimage.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.gdimage.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.gdimage.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -385,4 +385,3 @@
}
}
}
-?>
Modified: branches/dev-syncromind/phpgwapi/inc/class.html2text.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.html2text.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.html2text.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -430,4 +430,3 @@
}
-?>
Modified: branches/dev-syncromind/phpgwapi/inc/class.http_svn_client.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.http_svn_client.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.http_svn_client.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -272,4 +272,3 @@
return $rarray;
}
}
-?>
Modified: branches/dev-syncromind/phpgwapi/inc/class.interserver.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.interserver.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.interserver.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -547,4 +547,3 @@
return False;
}
}
-?>
Modified: branches/dev-syncromind/phpgwapi/inc/class.ipc_manager.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.ipc_manager.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.ipc_manager.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -196,4 +196,3 @@
}
}
-?>
Modified: branches/dev-syncromind/phpgwapi/inc/class.locations.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.locations.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.locations.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -447,7 +447,7 @@
if($c_function)
{
- $filter .= ' AND c_function = 1';
+ $filter .= ' AND allow_c_function = 1';
}
$sql = "SELECT phpgw_locations.location_id,
phpgw_locations.name, phpgw_locations.descr FROM phpgw_locations"
Modified: branches/dev-syncromind/phpgwapi/inc/class.mail2array.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.mail2array.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.mail2array.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -506,4 +506,3 @@
}
return trim($val);
}
-?>
Modified: branches/dev-syncromind/phpgwapi/inc/class.mail_handlers.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.mail_handlers.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.mail_handlers.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -99,4 +99,3 @@
$this->db->query($sql, __LINE__, __FILE__);
}
}
-?>
Modified: branches/dev-syncromind/phpgwapi/inc/class.matrixview.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.matrixview.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.matrixview.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -336,4 +336,3 @@
echo '</form>' . "\n";
}
}
-?>
Modified: branches/dev-syncromind/phpgwapi/inc/class.net_http_client.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.net_http_client.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.net_http_client.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -856,5 +856,3 @@
} // end class net_http_client
-
-?>
Modified: branches/dev-syncromind/phpgwapi/inc/class.network.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.network.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.network.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -232,4 +232,4 @@
}
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.nextmatchs_xslt.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.nextmatchs_xslt.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.nextmatchs_xslt.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -138,4 +138,4 @@
return $nm_data;
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.preferences.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.preferences.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.preferences.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -434,7 +434,7 @@
* the effektive prefs ($this->data) are updated to reflect the
change
* @return the new effective prefs (even when forced or default
prefs are deleted!)
*/
- public function delete($app_name, $var = False,$type = 'user')
+ public function delete($app_name, $var = false,$type = 'user')
{
//echo "<p>delete('$app_name','$var')</p>\n";
$set_via = array(
@@ -446,7 +446,7 @@
{
$type = 'user';
}
- if ($all = (is_string($var) && $var == ''))
+ if ($all = !$var)
{
unset($this->{$type}[$app_name]);
unset($this->data[$app_name]);
Modified: branches/dev-syncromind/phpgwapi/inc/class.rssparser.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.rssparser.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.rssparser.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -225,4 +225,4 @@
return $GLOBALS['_rss'];
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.schema_proc.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.schema_proc.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.schema_proc.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -716,4 +716,4 @@
return $this->m_odb->validate_insert($values);
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.schema_proc_array.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.schema_proc_array.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.schema_proc_array.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -184,4 +184,4 @@
return True;
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.schema_proc_mssql.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.schema_proc_mssql.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.schema_proc_mssql.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -435,4 +435,4 @@
}
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.schema_proc_mysql.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.schema_proc_mysql.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.schema_proc_mysql.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -448,4 +448,4 @@
return false;
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.schema_proc_oracle.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.schema_proc_oracle.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.schema_proc_oracle.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -466,4 +466,4 @@
return false;
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.schema_proc_pgsql.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.schema_proc_pgsql.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.schema_proc_pgsql.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -772,4 +772,4 @@
return false;
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.schema_proc_sapdb.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.schema_proc_sapdb.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.schema_proc_sapdb.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -536,4 +536,4 @@
return false;
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.service.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.service.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.service.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -53,4 +53,4 @@
return $this->function_map;
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.service_contacts.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.service_contacts.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.service_contacts.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -51,4 +51,4 @@
return ExecMethod($this->svc . '.' .
$this->function_map['delete']['function'],$data);
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.service_notes.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.service_notes.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.service_notes.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -52,4 +52,4 @@
return ExecMethod($this->svc . '.' .
$this->function_map['delete']['function'],$data);
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.service_schedule.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.service_schedule.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.service_schedule.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -57,4 +57,4 @@
return ExecMethod($this->svc . '.' .
$this->function_map['export_event']['function'],$data);
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.setup.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.setup.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.setup.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -838,4 +838,4 @@
return 'phpgw_hooks';
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.setup_detection.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.setup_detection.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.setup_detection.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -493,5 +493,4 @@
return True;
}
}
- }
-?>
+ }
\ No newline at end of file
Modified: branches/dev-syncromind/phpgwapi/inc/class.sql.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.sql.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.sql.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -507,4 +507,4 @@
return $return_value;
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.ui_tools.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.ui_tools.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.ui_tools.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -190,4 +190,4 @@
return $elm;
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.uijsaddressbook.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.uijsaddressbook.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.uijsaddressbook.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -1079,4 +1079,4 @@
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.utilities.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.utilities.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.utilities.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -43,4 +43,4 @@
$GLOBALS['phpgw']->sbox =
createObject('phpgwapi.portalbox');
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.validator.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.validator.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.validator.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -305,4 +305,4 @@
exit;
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.vcard.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.vcard.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.vcard.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -875,4 +875,4 @@
}
} //end class
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.vfs_dav.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.vfs_dav.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.vfs_dav.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -2127,4 +2127,4 @@
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.vfs_shared.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.vfs_shared.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.vfs_shared.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -1829,4 +1829,4 @@
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/class.xml.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.xml.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/class.xml.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -3360,4 +3360,3 @@
}
}
-?>
\ No newline at end of file
Modified: branches/dev-syncromind/phpgwapi/inc/excel/BIFFwriter.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/excel/BIFFwriter.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/excel/BIFFwriter.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -206,4 +206,3 @@
return($tmp);
}
}
-?>
\ No newline at end of file
Modified: branches/dev-syncromind/phpgwapi/inc/excel/Format.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/excel/Format.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/excel/Format.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -634,4 +634,3 @@
$this->_text_wrap = $text_wrap;
}
}
-?>
\ No newline at end of file
Modified: branches/dev-syncromind/phpgwapi/inc/excel/Workbook.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/excel/Workbook.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/excel/Workbook.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -951,4 +951,3 @@
$this->_append($header.$data);
}
}
-?>
\ No newline at end of file
Modified: branches/dev-syncromind/phpgwapi/inc/excel/Worksheet.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/excel/Worksheet.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/excel/Worksheet.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -2832,4 +2832,3 @@
$this->_append($header.$data);
}
}
-?>
\ No newline at end of file
Modified: branches/dev-syncromind/phpgwapi/inc/excel/test.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/excel/test.php 2015-06-10 12:22:05 UTC
(rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/excel/test.php 2015-06-10 12:32:10 UTC
(rev 13400)
@@ -85,4 +85,3 @@
//$worksheet2->insert_bitmap(0, 0, "some.bmp",10,10);
$workbook->close();
-?>
\ No newline at end of file
Modified: branches/dev-syncromind/phpgwapi/inc/exchange/class_http.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/exchange/class_http.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/exchange/class_http.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -405,4 +405,4 @@
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/exchange/class_xml.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/exchange/class_xml.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/exchange/class_xml.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -75,4 +75,4 @@
return utf8_decode(trim($string));
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/exchange/example_xml.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/exchange/example_xml.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/exchange/example_xml.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -53,4 +53,4 @@
echo "<h1>Log</h1>";
echo $x->log;
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/exchange/image_cache.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/exchange/image_cache.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/exchange/image_cache.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -21,4 +21,4 @@
$h->fetch($_GET['url'], $_GET['ttl']);
header("Content-Type: image/jpeg");
echo $h->body;
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/geshi/geshi/actionscript.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/geshi/geshi/actionscript.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/geshi/geshi/actionscript.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -196,4 +196,4 @@
'HIGHLIGHT_STRICT_BLOCK' => array()
);
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/geshi/geshi/ada.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/geshi/geshi/ada.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/geshi/geshi/ada.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -132,4 +132,4 @@
)
);
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/geshi/geshi/apache.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/geshi/geshi/apache.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/geshi/geshi/apache.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -170,4 +170,4 @@
)
);
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/geshi/geshi/applescript.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/geshi/geshi/applescript.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/geshi/geshi/applescript.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -133,4 +133,4 @@
)
);
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/geshi/geshi/asm.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/geshi/geshi/asm.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/geshi/geshi/asm.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -197,4 +197,4 @@
)
);
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/geshi/geshi/bash.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/geshi/geshi/bash.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/geshi/geshi/bash.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -127,4 +127,4 @@
)
);
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/geshi/geshi/blitzbasic.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/geshi/geshi/blitzbasic.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/geshi/geshi/blitzbasic.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -184,4 +184,3 @@
)
);
-?>
\ No newline at end of file
Modified: branches/dev-syncromind/phpgwapi/inc/geshi/geshi/c.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/geshi/geshi/c.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/geshi/geshi/c.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -141,4 +141,3 @@
)
);
-?>
\ No newline at end of file
Modified: branches/dev-syncromind/phpgwapi/inc/geshi/geshi/c_mac.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/geshi/geshi/c_mac.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/geshi/geshi/c_mac.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -173,4 +173,3 @@
)
);
-?>
\ No newline at end of file
Modified: branches/dev-syncromind/phpgwapi/inc/geshi/geshi/caddcl.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/geshi/geshi/caddcl.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/geshi/geshi/caddcl.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -124,4 +124,4 @@
)
);
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/geshi/geshi/cadlisp.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/geshi/geshi/cadlisp.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/geshi/geshi/cadlisp.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -184,4 +184,3 @@
)
);
-?>
\ No newline at end of file
Modified: branches/dev-syncromind/phpgwapi/inc/geshi/geshi/cfdg.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/geshi/geshi/cfdg.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/geshi/geshi/cfdg.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -124,5 +124,5 @@
)
);
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/geshi/geshi/cfm.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/geshi/geshi/cfm.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/geshi/geshi/cfm.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -324,4 +324,3 @@
)
);
-?>
\ No newline at end of file
Modified: branches/dev-syncromind/phpgwapi/inc/geshi/geshi/cpp.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/geshi/geshi/cpp.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/geshi/geshi/cpp.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -169,4 +169,4 @@
)
);
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/geshi/geshi/csharp.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/geshi/geshi/csharp.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/geshi/geshi/csharp.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -230,4 +230,4 @@
)
);
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/geshi/geshi/css.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/geshi/geshi/css.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/geshi/geshi/css.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -175,4 +175,3 @@
)
);
-?>
\ No newline at end of file
Modified: branches/dev-syncromind/phpgwapi/inc/log_functions.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/log_functions.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/log_functions.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -79,4 +79,3 @@
}
}
-?>
Modified: branches/dev-syncromind/phpgwapi/inc/mapping/class.mapping_.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/mapping/class.mapping_.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/mapping/class.mapping_.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -256,4 +256,3 @@
}
}
-?>
Modified:
branches/dev-syncromind/phpgwapi/inc/mapping/class.mapping_ldap.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/mapping/class.mapping_ldap.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/mapping/class.mapping_ldap.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -68,4 +68,4 @@
return $auth->authenticate($uid,$password);
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/mapping/class.mapping_sql.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/mapping/class.mapping_sql.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/mapping/class.mapping_sql.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -72,4 +72,4 @@
return $auth->authenticate($uid,$password,'text');
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/pclzip/pclzip.lib.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/pclzip/pclzip.lib.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/pclzip/pclzip.lib.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -5691,4 +5691,3 @@
//
--------------------------------------------------------------------------------
-?>
Modified: branches/dev-syncromind/phpgwapi/inc/soaplib.soapinterop.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/soaplib.soapinterop.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/soaplib.soapinterop.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -148,4 +148,4 @@
array('string','string','string'),
array('array')
);
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/yui-combo-master/combo.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/yui-combo-master/combo.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/yui-combo-master/combo.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -13,4 +13,4 @@
$combo = new YUICombo($_GET, $config);
$combo->loadModules();
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/yui-combo-master/lib/YUICombo.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/yui-combo-master/lib/YUICombo.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/yui-combo-master/lib/YUICombo.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -211,4 +211,4 @@
$this->modules = $newModules;
}
}
-?>
+
Modified:
branches/dev-syncromind/phpgwapi/inc/yui-combo-master/lib/YUIFileUtil.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/yui-combo-master/lib/YUIFileUtil.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/yui-combo-master/lib/YUIFileUtil.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -50,4 +50,4 @@
return false;
}
}
-?>
+
Modified:
branches/dev-syncromind/phpgwapi/inc/yui-combo-master/lib/YUIHeaderUtil.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/yui-combo-master/lib/YUIHeaderUtil.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/yui-combo-master/lib/YUIHeaderUtil.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -28,4 +28,4 @@
header("Content-Encoding: gzip");
}
}
-?>
+
Modified: branches/dev-syncromind/phpgwapi/inc/yui-combo-master/settings.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/yui-combo-master/settings.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/inc/yui-combo-master/settings.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -14,4 +14,4 @@
}
define(DS, DIRECTORY_SEPARATOR);
-?>
+
Modified: branches/dev-syncromind/phpgwapi/setup/tables_baseline.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/setup/tables_baseline.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/setup/tables_baseline.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -182,4 +182,4 @@
'uc' => array()
)
);
-?>
+
Modified: branches/dev-syncromind/phpgwapi/setup/test_data.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/setup/test_data.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/setup/test_data.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -37,4 +37,4 @@
'address@hidden','212-555-5555','212-555-4444','212-555-4445','212-555-5556',
'212-555-5557','212-555-5558','321 Contact','Oiforgot','North
Dakota','15421',
'10/05/1955','This is a test note\nfor verification','Baubles and
Beads')");
-?>
+
Modified: branches/dev-syncromind/phpgwapi/templates/desktop/head.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/desktop/head.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/templates/desktop/head.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -45,4 +45,4 @@
$tpl->set_var($var);
$tpl->pfp('out','head');
unset($tpl);
-?>
+
Modified: branches/dev-syncromind/phpgwapi/templates/idsociety/head.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/idsociety/head.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/templates/idsociety/head.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -54,4 +54,4 @@
$GLOBALS['phpgw']->template->set_var($var);
$GLOBALS['phpgw']->template->pfp('out','head');
unset($tpl);
-?>
+
Modified:
branches/dev-syncromind/phpgwapi/templates/linux-at-work.de/head.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/linux-at-work.de/head.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/templates/linux-at-work.de/head.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -43,6 +43,6 @@
$tpl->set_var($var);
$tpl->pfp('out', 'head');
unset ($tpl);
-?>
+
Modified: branches/dev-syncromind/phpgwapi/templates/portico/css/base.css
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/css/base.css
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/templates/portico/css/base.css
2015-06-10 12:32:10 UTC (rev 13400)
@@ -400,3 +400,10 @@
cursor: default;
}
+.home_portal_controls
+{
+ float: right;
+ text-align: right;
+ padding: 5px 5px 0px 0px;
+ width: 10px;
+}
Modified: branches/dev-syncromind/phpgwapi/templates/probusiness/head.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/probusiness/head.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/templates/probusiness/head.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -80,4 +80,4 @@
$tpl->set_var($var);
$tpl->pfp('out','head');
unset($tpl);
-?>
+
Modified: branches/dev-syncromind/phpgwapi/templates/simple/head.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/simple/head.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpgwapi/templates/simple/head.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -98,4 +98,4 @@
$tpl->pfp('out','head');
unset($tpl);
-?>
+
Modified: branches/dev-syncromind/phpsysinfo/setup/setup.inc.php
===================================================================
--- branches/dev-syncromind/phpsysinfo/setup/setup.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/phpsysinfo/setup/setup.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -32,5 +32,4 @@
$setup_info['phpsysinfo']['depends'][] = array(
'appname' => 'phpgwapi',
'versions' => Array('0.9.16', '0.9.17', '0.9.18')
- );
-?>
+ );
\ No newline at end of file
Modified: branches/dev-syncromind/preferences/inc/class.boadmin_acl.inc.php
===================================================================
--- branches/dev-syncromind/preferences/inc/class.boadmin_acl.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/preferences/inc/class.boadmin_acl.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -128,7 +128,7 @@
}
}
- function select_location($format = 'filter', $selected='',
$grant = false, $allow_c_attrib = false)
+ function select_location($format = 'filter', $selected='',
$grant = false, $allow_c_attrib = false, $allow_c_functions = false)
{
switch($format)
@@ -143,7 +143,7 @@
$location_list = array();
- $locations =
$GLOBALS['phpgw']->locations->get_locations($grant, $this->acl_app,
$allow_c_attrib);
+ $locations =
$GLOBALS['phpgw']->locations->get_locations($grant, $this->acl_app,
$allow_c_attrib, $allow_c_functions);
$i = 0;
foreach ( $locations as $loc_id => $loc_descr )
Modified: branches/dev-syncromind/property/inc/class.hook_helper.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.hook_helper.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/property/inc/class.hook_helper.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -89,6 +89,7 @@
*/
public function home_backend()
{
+ $this->home_tenant_claims();
$this->home_ticket();
$this->home_project();
$this->home_workorder();
@@ -103,7 +104,93 @@
$this->home_ticket();
}
+ private function get_controls($app_id)
+ {
+ $var = array
+ (
+ 'up' => array('url' => '/set_box.php',
'app' => $app_id),
+ 'down' => array('url' => '/set_box.php',
'app' => $app_id),
+// 'close' => array('url' => '/set_box.php',
'app' => $app_id),
+// 'question' => array('url' =>
'/set_box.php', 'app' => $app_id),
+// 'edit' => array('url' => '/set_box.php',
'app' => $app_id)
+ );
+ return $var;
+ }
+
/**
+ * Show tenant claims on homepage
+ *
+ * @return void
+ */
+ public function home_tenant_claims()
+ {
+ $accound_id =
$GLOBALS['phpgw_info']['user']['account_id'];
+ $save_app =
$GLOBALS['phpgw_info']['flags']['currentapp'];
+ $GLOBALS['phpgw_info']['flags']['currentapp'] =
'property';
+ $maxmatches =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] = 5;
+
+ $prefs = $GLOBALS['phpgw_info']['user']['preferences'];
+
+ if (
isset($prefs['property']['mainscreen_show_open_tenant_claim'])
+ &&
$prefs['property']['mainscreen_show_open_tenant_claim'] == 'yes')
+ {
+ $sotenant_claim =
CreateObject('property.sotenant_claim');
+ $claims = $sotenant_claim->read(array
+ (
+ 'start' => 0,
+ 'user_id' => $accound_id
+ )
+ );
+
+ $total_records = $sotenant_claim->total_records;
+ $portalbox = CreateObject('phpgwapi.listbox',
array
+ (
+ 'title' => lang('tenant claim')
. " ({$total_records})",
+ 'primary' =>
$GLOBALS['phpgw_info']['theme']['navbar_bg'],
+ 'secondary' =>
$GLOBALS['phpgw_info']['theme']['navbar_bg'],
+ 'tertiary' =>
$GLOBALS['phpgw_info']['theme']['navbar_bg'],
+ 'width' => '100%',
+ 'outerborderwidth' => '0',
+ 'header_background_image' =>
$GLOBALS['phpgw']->common->image('phpgwapi','bg_filler', '.png', False)
+ ));
+
+ $app_id =
$GLOBALS['phpgw']->applications->name2id('property');
+ if( !isset($GLOBALS['portal_order'])
||!in_array($app_id, $GLOBALS['portal_order']) )
+ {
+ $GLOBALS['portal_order'][] = $app_id;
+ }
+
+ $var = $this->get_controls($app_id);
+
+ foreach ( $var as $key => $value )
+ {
+ // $portalbox->set_controls($key,$value);
+ }
+ foreach ($claims as &$entry)
+ {
+ $entry['entry_date'] =
$GLOBALS['phpgw']->common->show_date($entry['entry_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $location_info =
execMethod('property.solocation.read_single',$entry['location_code']);
+ $entry['loc1_name'] =
$location_info['loc1_name'];
+ $entry['loc_category'] =
$location_info['category_name'];
+
+ $portalbox->data[] = array
+ (
+ 'text' => "{$entry['claim_id']}
:: {$entry['location_code']} :: {$location_info['loc1_name']} ::
{$location_info['category_name']} :: {$entry['name']}",
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uitenant_claim.edit', 'claim_id' => $entry['claim_id']))
+ );
+ }
+ echo "\n".'<!-- BEGIN ticket info -->'."\n<div
class='property_tickets' style='padding-left:
10px;'>".$portalbox->draw()."</div>\n".'<!-- END ticket info -->'."\n";
+
+ unset($tts);
+ unset($portalbox);
+ unset($category_name);
+ unset($default_status);
+
+ }
+
+ }
+ /**
* Show ticket info for homepage
*
* @return void
@@ -144,18 +231,12 @@
{
$GLOBALS['portal_order'][] = $app_id;
}
- $var = array
- (
- 'up' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'down' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'close' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'question' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'edit' => array('url' =>
'/set_box.php', 'app' => $app_id)
- );
+ $var = $this->get_controls($app_id);
+
foreach ( $var as $key => $value )
{
- //
$portalbox->set_controls($key,$value);
+ $portalbox->set_controls($key,$value);
}
$category_name = array(); // caching
@@ -224,18 +305,12 @@
{
$GLOBALS['portal_order'][] = $app_id;
}
- $var = array
- (
- 'up' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'down' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'close' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'question' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'edit' => array('url' =>
'/set_box.php', 'app' => $app_id)
- );
+ $var = $this->get_controls($app_id);
+
foreach ( $var as $key => $value )
{
- //
$portalbox->set_controls($key,$value);
+ // $portalbox->set_controls($key,$value);
}
$category_name = array(); // caching
@@ -305,18 +380,12 @@
{
$GLOBALS['portal_order'][] = $app_id;
}
- $var = array
- (
- 'up' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'down' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'close' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'question' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'edit' => array('url' =>
'/set_box.php', 'app' => $app_id)
- );
+ $var = $this->get_controls($app_id);
+
foreach ( $var as $key => $value )
{
- //
$portalbox->set_controls($key,$value);
+ // $portalbox->set_controls($key,$value);
}
$category_name = array(); // caching
@@ -384,18 +453,12 @@
{
$GLOBALS['portal_order'][] = $app_id;
}
- $var = array
- (
- 'up' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'down' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'close' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'question' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'edit' => array('url' =>
'/set_box.php', 'app' => $app_id)
- );
+ $var = $this->get_controls($app_id);
+
foreach ( $var as $key => $value )
{
- //
$portalbox->set_controls($key,$value);
+ // $portalbox->set_controls($key,$value);
}
$status = array();
@@ -495,18 +558,12 @@
{
$GLOBALS['portal_order'][] = $app_id;
}
- $var = array
- (
- 'up' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'down' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'close' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'question' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'edit' => array('url' =>
'/set_box.php', 'app' => $app_id)
- );
+ $var = $this->get_controls($app_id);
+
foreach ( $var as $key => $value )
{
- //
$portalbox->set_controls($key,$value);
+ // $portalbox->set_controls($key,$value);
}
$portalbox->data = array();
@@ -570,18 +627,12 @@
{
$GLOBALS['portal_order'][] = $app_id;
}
- $var = array
- (
- 'up' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'down' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'close' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'question' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'edit' => array('url' =>
'/set_box.php', 'app' => $app_id)
- );
+ $var = $this->get_controls($app_id);
+
foreach ( $var as $key => $value )
{
- //
$portalbox->set_controls($key,$value);
+ // $portalbox->set_controls($key,$value);
}
$portalbox->data = array();
@@ -625,18 +676,12 @@
{
$GLOBALS['portal_order'][] = $app_id;
}
- $var = array
- (
- 'up' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'down' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'close' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'question' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'edit' => array('url' =>
'/set_box.php', 'app' => $app_id)
- );
+ $var = $this->get_controls($app_id);
+
foreach ( $var as $key => $value )
{
- //
$portalbox->set_controls($key,$value);
+ // $portalbox->set_controls($key,$value);
}
$portalbox->data = array();
@@ -681,18 +726,11 @@
$GLOBALS['portal_order'][] = $app_id;
}
- $var = array
- (
- 'up' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'down' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'close' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'question' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'edit' => array('url' =>
'/set_box.php', 'app' => $app_id)
- );
+ $var = $this->get_controls($app_id);
foreach ( $var as $key => $value )
{
- //
$portalbox->set_controls($key,$value);
+ // $portalbox->set_controls($key,$value);
}
$action_params = array
@@ -804,18 +842,11 @@
$GLOBALS['portal_order'][] = $app_id;
}
- $var = array
- (
- 'up' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'down' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'close' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'question' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'edit' => array('url' =>
'/set_box.php', 'app' => $app_id)
- );
+ $var = $this->get_controls($app_id);
foreach ( $var as $key => $value )
{
- //
$portalbox->set_controls($key,$value);
+ // $portalbox->set_controls($key,$value);
}
$action_params = array
@@ -931,18 +962,11 @@
$GLOBALS['portal_order'][] = $app_id;
}
- $var = array
- (
- 'up' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'down' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'close' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'question' => array('url' =>
'/set_box.php', 'app' => $app_id),
- 'edit' => array('url' =>
'/set_box.php', 'app' => $app_id)
- );
+ $var = $this->get_controls($app_id);
foreach ( $var as $key => $value )
{
- //
$portalbox->set_controls($key,$value);
+ // $portalbox->set_controls($key,$value);
}
$action_params = array
Modified: branches/dev-syncromind/property/inc/class.sotts.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.sotts.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/property/inc/class.sotts.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -400,17 +400,22 @@
$order_edit =
$GLOBALS['phpgw']->acl->check('.ticket.order', PHPGW_ACL_EDIT, 'property');
$_end_date = $end_date + 3600 * 16 +
phpgwapi_datetime::user_timezone();
$_start_date = $start_date - 3600 * 8 +
phpgwapi_datetime::user_timezone();
- $filtermethod .= " $where
fm_tts_tickets.entry_date >= $_start_date AND fm_tts_tickets.entry_date <=
$_end_date ";
+ $filtermethod .= " $where
(fm_tts_tickets.entry_date >= $_start_date AND fm_tts_tickets.entry_date <=
$_end_date ";
if($order_add || $order_edit)
{
$end_period = date('Ym', $end_date);
$start_period = date('Ym',
$start_date);
+ $filtermethod .= " OR
(fm_tts_payments.period >= {$start_period} AND fm_tts_payments.period <=
{$end_period}))";
$date_join = "LEFT JOIN fm_tts_payments
ON ( fm_tts_tickets.id=fm_tts_payments.ticket_id AND fm_tts_payments.period >=
$start_period AND fm_tts_payments.period <= $end_period )";
$actual_cost_field =
'SUM(fm_tts_payments.amount) AS actual_cost';
$actual_cost_group_field = '';
}
+ else
+ {
+ $filtermethod .= ')';
+ }
$where= 'AND';
}
@@ -448,7 +453,7 @@
if(!$p_num)
{
$query=explode(".",$query);
- $querymethod .= " OR
(fm_tts_tickets.loc1='{$query[0]}' AND fm_tts_tickets.loc4='{$query[1]}'))";
+ $querymethod .= " OR
(fm_tts_tickets.loc1='{$query[0]}' AND fm_tts_tickets.loc4='{$query[1]}')";
}
else
{
@@ -456,21 +461,22 @@
$querymethod = " {$where}
(fm_tts_tickets.p_entity_id='" . (int)$query[1] . "' AND
fm_tts_tickets.p_cat_id='" . (int)$query[2] . "' AND
fm_tts_tickets.p_num='{$query[3]}')";
}
}
- else
- {
- $querymethod .= ')';
- }
+
$custom_filter =
$this->custom->get_custom_filter($location_id,'fm_tts_tickets', $criteria_id =
'', $query);
if ($custom_filter['querymethod'])
{
- $_where = $where = 'AND' ? 'OR' :
'WHERE';
+ $_where = $where == 'AND' ? 'OR' :
'WHERE';
$querymethod .= " $_where (" . implode
(' OR ',$custom_filter['querymethod']) . ')';
}
else
if(isset($custom_filter['joinmethod_datatype']) &&
$custom_filter['joinmethod_datatype'])
{
$querymethod = '';
}
+ if($querymethod)
+ {
+ $querymethod .= ')';
+ }
}
$return_fields =
"fm_tts_tickets.id,fm_tts_tickets.assignedto,fm_tts_tickets.status,fm_tts_tickets.user_id,"
@@ -553,24 +559,22 @@
$closed_status[] =
"C{$custom['id']}";
}
}
-
- $filter_closed = "{$where}
fm_tts_tickets.status NOT IN ('" . implode("','", $closed_status) . "')";
+ $filter_closed = " AND fm_tts_tickets.status
NOT IN ('" . implode("','", $closed_status) . "')";
$sql2 = "SELECT (SUM(budget) -
SUM(actual_cost)) as sum_difference FROM ({$sql_cnt} {$filter_closed} GROUP BY
fm_tts_tickets.id, fm_tts_tickets.budget {$actual_cost_group_field}) as t";
$this->db->query($sql2,__LINE__,__FILE__);
$this->db->next_record();
unset($sql2);
- $cache_info['sum_difference'] =
(int)$this->db->f('sum_difference');
+ $cache_info['sum_difference'] =
(float)$this->db->f('sum_difference');
phpgwapi_cache::session_set('property','tts_listing_metadata',$cache_info);
}
- $this->total_records = $cache_info['total_records'];
- $this->sum_budget =
$cache_info['sum_budget'];
- $this->sum_actual_cost =
$cache_info['sum_actual_cost'];
- $this->sum_difference = $cache_info['sum_difference'];
+ $this->total_records =
(int)$cache_info['total_records'];
+ $this->sum_budget =
(int)$cache_info['sum_budget'];
+ $this->sum_actual_cost =
(int)$cache_info['sum_actual_cost'];
+ $this->sum_difference =
(float)$cache_info['sum_difference'];
-
$tickets = array();
if(!$dry_run)
{
Modified: branches/dev-syncromind/property/inc/hook_settings.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/hook_settings.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/property/inc/hook_settings.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -73,6 +73,8 @@
}
+ create_select_box('show oen tenant claims on main
screen','mainscreen_show_open_tenant_claim',$yes_and_no,'Link to claims you are
assigned to');
+
create_select_box('show new/updated tickets on main
screen','mainscreen_show_new_updated_tts',$yes_and_no,'Link to tickets you are
assigned to');
create_select_box('Default ticket
status','tts_status',$_status_tts,'The default status when entering the
helpdesk and mainscreen');
create_input_box('Custom title on main screen
tickets','mainscreen_tts_title');
Copied: branches/dev-syncromind/rental/inc/class.hook_helper.inc.php (from rev
13399, trunk/rental/inc/class.hook_helper.inc.php)
===================================================================
--- branches/dev-syncromind/rental/inc/class.hook_helper.inc.php
(rev 0)
+++ branches/dev-syncromind/rental/inc/class.hook_helper.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -0,0 +1,74 @@
+<?php
+ /**
+ * property - Hook helper
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2015 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @package rental
+ * @version $Id: class.hook_helper.inc.php 11076 2013-04-25 07:19:14Z
sigurdne $
+ */
+
+ /*
+ This program 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.
+
+ This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+ /**
+ * Hook helper
+ *
+ * @package rental
+ */
+ class rental_hook_helper
+ {
+
+ /**
+ * Add a contact to a location
+ *
+ * @return void
+ */
+ public function add_contract_from_composite(&$data)
+ {
+ if(!isset($data['location_code']) ||
!$data['location_code'])
+ {
+ phpgwapi_cache::message_set("location_code not
set", 'error');
+ return false;
+ }
+
+ $criteria = array
+ (
+ 'appname' => 'rental',
+ 'location' =>
$data['acl_location'],
+ 'pre_commit' => true,
+ 'allrows' => true
+ );
+
+ $custom_functions =
$GLOBALS['phpgw']->custom_functions->find($criteria);
+
+ foreach ( $custom_functions as $entry )
+ {
+ // prevent path traversal
+ if ( preg_match('/\.\./', $entry['file_name']) )
+ {
+ continue;
+ }
+
+ $file = PHPGW_SERVER_ROOT .
"/rental/inc/custom/{$GLOBALS['phpgw_info']['user']['domain']}/{$entry['file_name']}";
+ if ( $entry['active'] && is_file($file) &&
!$entry['client_side'])
+ {
+ require $file;
+ }
+ }
+ }
+ }
Modified: branches/dev-syncromind/rental/inc/class.menu.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.menu.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/rental/inc/class.menu.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -166,7 +166,12 @@
'text' => lang('import_adjustments'),
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'rental.uiimport.import_regulations', 'appname' => 'rental') ),
'image' => array('rental',
'document-save')
- )
+ ),
+ 'custom_functions' => array
+ (
+ 'text' => lang('custom functions'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.ui_custom.list_custom_function','appname' => 'rental', 'location' =>
'.contract', 'menu_selection' => 'admin::rental::custom_functions') )
+ ),
);
$menus['folders'] =
phpgwapi_menu::get_categories('bergen');
Modified: branches/dev-syncromind/rental/inc/class.socontract.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.socontract.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/rental/inc/class.socontract.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -1209,4 +1209,3 @@
}
}
-?>
Modified: branches/dev-syncromind/rental/inc/class.socontract_price_item.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.socontract_price_item.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/rental/inc/class.socontract_price_item.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -298,7 +298,8 @@
public function get_total_price($contract_id){
$ts_query = strtotime(date('Y-m-d')); // timestamp for query
(today)
//$this->db->query("SELECT sum(rcpi.total_price::numeric) AS
sum_total FROM rental_contract_price_item rcpi, rental_price_item rpi WHERE
rpi.id = rcpi.price_item_id AND NOT rpi.is_one_time AND
rcpi.contract_id={$contract_id} AND ((rcpi.date_start <= {$ts_query} AND
rcpi.date_end >= {$ts_query}) OR (rcpi.date_start <= {$ts_query} AND
(rcpi.date_end is null OR rcpi.date_end = 0)) OR (rcpi.date_start is null AND
(rcpi.date_end >= {$ts_query} OR rcpi.date_end is null)))");
- $this->db->query("SELECT sum(total_price::numeric) AS sum_total
FROM rental_contract_price_item WHERE NOT is_one_time AND
contract_id={$contract_id}");
+// $this->db->query("SELECT sum(total_price::numeric) AS sum_total
FROM rental_contract_price_item WHERE NOT is_one_time AND
contract_id={$contract_id}");
+ $this->db->query("SELECT sum(total_price::numeric) AS sum_total
FROM rental_contract_price_item WHERE contract_id={$contract_id} AND (NOT
is_one_time OR NOT is_billed)");
if($this->db->next_record()){
$total_price = $this->db->f('sum_total');
return $total_price;
Modified: branches/dev-syncromind/rental/inc/class.uicontract.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uicontract.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/rental/inc/class.uicontract.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -677,6 +677,31 @@
{
$contract = new rental_contract();
$contract->set_location_id(phpgw::get_var('responsibility_id'));
+
$contract->set_account_in(rental_socontract::get_instance()->get_default_account($contract->get_location_id(),
true));
+
$contract->set_account_out(rental_socontract::get_instance()->get_default_account($contract->get_location_id(),
false));
+
$contract->set_executive_officer_id($GLOBALS['phpgw_info']['user']['account_id']);
+
+ $config = CreateObject('phpgwapi.config','rental');
+ $config->read();
+ $default_billing_term =
$config->config_data['default_billing_term'];
+
+ $contract->set_term_id($default_billing_term);
+
+ $units =
rental_socomposite::get_instance()->get_single(phpgw::get_var('id'))->get_units();
+ $location_code =
$units[0]->get_location()->get_location_code();
+
+ $args = array
+ (
+ 'acl_location' => '.contract',
+ 'location_code' => $location_code,
+ 'contract' => &$contract
+ );
+
+ $hook_helper = CreateObject('rental.hook_helper');
+ $hook_helper->add_contract_from_composite($args);
+
+ // _debug_array($contract); die();
+
if($contract->has_permission(PHPGW_ACL_EDIT))
{
$so_contract =
rental_socontract::get_instance();
@@ -684,9 +709,22 @@
$db_contract->transaction_begin();
if($so_contract->store($contract))
{
+ // Add standard price items to contract
+ if($contract->get_location_id() &&
($this->isExecutiveOfficer() || $this->isAdministrator()))
+ {
+ $so_price_item =
rental_soprice_item::get_instance();
+ //get default price items for
location_id
+ $default_price_items =
$so_contract->get_default_price_items($contract->get_location_id());
+
+ foreach($default_price_items as
$price_item_id)
+ {
+
$so_price_item->add_price_item($contract->get_id(), $price_item_id);
+ }
+ }
// Add that composite to the new
contract
$success =
$so_contract->add_composite($contract->get_id(), phpgw::get_var('id'));
- if($success){
+ if($success)
+ {
$db_contract->transaction_commit();
$comp_name =
rental_socomposite::get_instance()->get_single(phpgw::get_var('id'))->get_name();
$message =
lang('messages_new_contract_from_composite').' '.$comp_name;
Modified: branches/dev-syncromind/rental/inc/hook_config.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/hook_config.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/rental/inc/hook_config.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -212,3 +212,34 @@
}
return $out;
}
+
+ /**
+ * Get HTML radiobox with default billing term for new contracts
+ *
+ * @param $config
+ * @return string HTML checkboxes to be placed in a table
+ */
+ function default_billing_term($config)
+ {
+ phpgw::import_class('rental.sobilling');
+ $billing_terms =
rental_sobilling::get_instance()->get_billing_terms();
+ $term_assigned = isset($config['default_billing_term']) ?
$config['default_billing_term'] : array();
+ $lang_none = lang('none');
+ $out = "<tr><td><input type=\"radio\"
name=\"newsettings[default_billing_term]\"
value=\"\"><label>{$lang_none}</label></td></tr>";
+
+ foreach ( $billing_terms as $term_id => $_label)
+ {
+ $label =
$GLOBALS['phpgw']->translation->translate($_label, array(), false, 'rental');
+ $checked = '';
+ if ($term_id == $term_assigned)
+ {
+ $checked = ' checked';
+ }
+
+ $out .= <<<HTML
+ <tr><td><input type="radio"
name="newsettings[default_billing_term]" value="{$term_id}"
{$checked}><label>{$label}</label></td></tr>
+HTML;
+ }
+ return $out;
+ }
+
Modified: branches/dev-syncromind/rental/inc/model/class.contract.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/model/class.contract.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/rental/inc/model/class.contract.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -256,7 +256,11 @@
$this->service_id = $service_id;
}
- public function get_service_id() { return $this->service_id; }
+ public function get_service_id()
+ {
+ //Add magic
+ return $this->service_id;
+ }
public function set_responsibility_id($responsibility_id)
{
Modified: branches/dev-syncromind/rental/setup/default_records.inc.php
===================================================================
--- branches/dev-syncromind/rental/setup/default_records.inc.php
2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/rental/setup/default_records.inc.php
2015-06-10 12:32:10 UTC (rev 13400)
@@ -34,7 +34,8 @@
//Create groups, users, add users to groups and set preferences
-$GLOBALS['phpgw']->locations->add('.', 'Root',
'rental',false);
+$GLOBALS['phpgw']->locations->add('.', 'Root',
'rental',false);
+$GLOBALS['phpgw']->locations->add('.contract', 'Contract','rental',
$allow_grant = false, $custom_tbl = false, $c_function = true);
$GLOBALS['phpgw']->locations->add('.ORG', 'Locations for
organisational units', 'rental',false);
$GLOBALS['phpgw']->locations->add('.ORG.BK', 'Organisational units
in Bergen Kommune', 'rental',false);
Modified: branches/dev-syncromind/rental/setup/setup.inc.php
===================================================================
--- branches/dev-syncromind/rental/setup/setup.inc.php 2015-06-10 12:22:05 UTC
(rev 13399)
+++ branches/dev-syncromind/rental/setup/setup.inc.php 2015-06-10 12:32:10 UTC
(rev 13400)
@@ -1,6 +1,6 @@
<?php
$setup_info['rental']['name'] = 'rental'; // Module
identifier
- $setup_info['rental']['version'] = '0.1.0.20'; // Current module
version
+ $setup_info['rental']['version'] = '0.1.0.21'; // Current module
version
$setup_info['rental']['app_order'] = 51; // (?)
$setup_info['rental']['tables'] = array(
'rental_party', // All
contract participants, tenants etc.
@@ -55,5 +55,4 @@
'config',
'menu' => 'rental.menu.get_menu',
'settings'
- );
-?>
+ );
\ No newline at end of file
Modified: branches/dev-syncromind/rental/setup/tables_update.inc.php
===================================================================
--- branches/dev-syncromind/rental/setup/tables_update.inc.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/rental/setup/tables_update.inc.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -8,52 +8,52 @@
function rental_upgrade0_0_27()
{
$GLOBALS['phpgw_setup']->oProc->AddColumn('rental_party','org_enhet_id', array
('type' => 'int','precision' => 8, 'nullable' => true));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0';
function rental_upgrade0_1_0()
{
$GLOBALS['phpgw_setup']->oProc->AlterColumn('rental_contract','adjustment_share',array(
- 'type' => 'int',
+ 'type' => 'int',
'precision' => '4',
'nullable' => true,
'default' => 100
));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.1';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.1';
function rental_upgrade0_1_0_1()
{
$GLOBALS['phpgw_setup']->oProc->AddColumn('rental_adjustment','adjustment_type',
array('type' => 'varchar','precision' => '255','nullable' => true));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.2';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.2';
function rental_upgrade0_1_0_2()
{
$GLOBALS['phpgw_setup']->oProc->AddColumn('rental_adjustment','is_executed',
array('type' => 'bool','nullable' => false,'default' => 'false'));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.3';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.3';
function rental_upgrade0_1_0_3()
{
$GLOBALS['phpgw_setup']->oProc->AddColumn('rental_contract','publish_comment',
array('type' => 'bool','nullable' => true,'default' => 'false'));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.4';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.4';
function rental_upgrade0_1_0_4()
{
@@ -64,52 +64,52 @@
'rental.soadjustment.run_adjustments',
null
);
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.5';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.5';
function rental_upgrade0_1_0_5()
{
$GLOBALS['phpgw_setup']->oProc->AlterColumn('rental_notification_workbench','notification_id',array(
- 'type' => 'int',
+ 'type' => 'int',
'precision' => '4',
'nullable' => true
));
-
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('rental_notification_workbench','workbench_message',
array('type' => 'text'));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.6';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.6';
function rental_upgrade0_1_0_6()
{
$GLOBALS['phpgw_setup']->oProc->AddColumn('rental_invoice','serial_number',array(
- 'type' => 'int',
+ 'type' => 'int',
'precision' => '8',
'nullable' => true
));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.7';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.7';
function rental_upgrade0_1_0_7()
{
$GLOBALS['phpgw_setup']->oProc->AddColumn('rental_price_item','standard',array(
- 'type' => 'bool',
+ 'type' => 'bool',
'nullable' => true,
'default' => 'false'
));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.8';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.8';
function rental_upgrade0_1_0_8()
{
@@ -118,16 +118,16 @@
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.9';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.9';
function rental_upgrade0_1_0_9()
{
-
-
+
+
$sql = 'SELECT config_name,config_value FROM phpgw_config'
. " WHERE config_name = 'files_dir'"
. " OR config_name = 'file_repository'";
-
+
$GLOBALS['phpgw_setup']->oProc->query($sql, __LINE__, __FILE__);
while ( $GLOBALS['phpgw_setup']->oProc->next_record() )
{
@@ -135,22 +135,22 @@
}
$GLOBALS['phpgw']->db = & $GLOBALS['phpgw_setup']->oProc->m_odb;
$acl = CreateObject('phpgwapi.acl');
-
+
$admins = $acl->get_ids_for_location('run', 1, 'admin');
$GLOBALS['phpgw_info']['user']['account_id'] = $admins[0];
-
+
//used in vfs
define('PHPGW_ACL_READ',1);
define('PHPGW_ACL_ADD',2);
define('PHPGW_ACL_EDIT',4);
define('PHPGW_ACL_DELETE',8);
-
+
$GLOBALS['phpgw']->session =
createObject('phpgwapi.sessions');
-
+
//Prepare paths
$vfs = CreateObject('phpgwapi.vfs');
$vfs->override_acl = 1;
-
+
$path = "/rental";
$dir = array('string' => $path, RELATIVE_NONE);
if(!$vfs->file_exists($dir)){
@@ -159,7 +159,7 @@
return;
}
}
-
+
$path .= "/billings";
$dir = array('string' => $path, RELATIVE_NONE);
if(!$vfs->file_exists($dir)){
@@ -168,17 +168,17 @@
return;
}
}
-
+
$sql = "SELECT id, export_data FROM rental_billing";
$db = clone $GLOBALS['phpgw']->db;
$result = $db->query($sql, __LINE__, __FILE__);
-
+
while($db->next_record())
{
$id = $db->f('id',true);
$export_data = $db->f('export_data','string');
$file_path = $path."/{$id}";
- if($export_data != ""){
+ if($export_data != ""){
$result = $vfs->write
(
array
@@ -190,7 +190,7 @@
);
}
}
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.10';
return $GLOBALS['setup_info']['rental']['currentver'];
}
@@ -203,17 +203,17 @@
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.11';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.11';
function rental_upgrade0_1_0_11()
{
// Add adjustment year column
$GLOBALS['phpgw_setup']->oProc->AddColumn('rental_adjustment',
'year', array(
- 'type' => 'int',
+ 'type' => 'int',
'nullable' => true,
'precision' => '4'
));
-
+
// Update year column to match the adjustment_date of all
existing adjustments
$so = CreateObject('rental.soadjustment');
foreach ($so->get(0, NULL, NULL, true, NULL, NULL, NULL) as
$adjustment) {
@@ -221,11 +221,11 @@
$adjustment->set_year($year);
$so->store($adjustment);
}
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.12';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.12';
function rental_upgrade0_1_0_12()
{
@@ -236,11 +236,11 @@
'rental.uiparty.syncronize_party_name',
null
);
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.13';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.13';
function rental_upgrade0_1_0_13()
{
@@ -249,21 +249,21 @@
'precision' => 4,
'nullable' => 'True'
));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.14';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.14';
function rental_upgrade0_1_0_14()
{
// Add unit_leader column
$GLOBALS['phpgw_setup']->oProc->AddColumn('rental_party',
'unit_leader', array(
- 'type' => 'varchar',
+ 'type' => 'varchar',
'nullable' => true,
'precision' => '255'
));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.15';
return $GLOBALS['setup_info']['rental']['currentver'];
}
@@ -282,18 +282,18 @@
'rental.soparty.syncronize_party_name',
null
);
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.16';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
- $test[] = '0.1.0.16';
+
+ $test[] = '0.1.0.16';
function rental_upgrade0_1_0_16()
- {
+ {
$sql = "INSERT INTO rental_billing_term (title, months) VALUES
('free_of_charge','0')";
$db = clone $GLOBALS['phpgw']->db;
$result = $db->query($sql, __LINE__, __FILE__);
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.17';
return $GLOBALS['setup_info']['rental']['currentver'];
}
@@ -315,7 +315,7 @@
'fd' => array(
'id' => array('type' =>
'int','precision' => '4','nullable' => false),
'name' => array('type' =>
'varchar','precision' => '255','nullable' => false),
- 'factor' => array('type' => 'decimal', 'precision' =>
'20','scale' => '2', 'nullable' => true),
+ 'factor' => array('type' => 'decimal',
'precision' => '20','scale' => '2', 'nullable' => true),
),
'pk' => array('id'),
'fk' => array(),
@@ -354,17 +354,25 @@
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.19';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
- $test[] = '0.1.0.19';
+
+ $test[] = '0.1.0.19';
function rental_upgrade0_1_0_19()
{
// Add unit_leader column
$GLOBALS['phpgw_setup']->oProc->AddColumn('rental_adjustment',
'extra_adjustment', array(
- 'type' => 'bool',
+ 'type' => 'bool',
'nullable' => true,
'default' => 'false'
));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.20';
return $GLOBALS['setup_info']['rental']['currentver'];
}
+
+ $test[] = '0.1.0.20';
+ function rental_upgrade0_1_0_20()
+ {
+
$GLOBALS['phpgw']->locations->add('.contract','Contract','rental', $allow_grant
= false, $custom_tbl = false, $c_function = true);
+ $GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.21';
+ return $GLOBALS['setup_info']['rental']['currentver'];
+ }
Modified: branches/dev-syncromind/rental/templates/base/config.tpl
===================================================================
--- branches/dev-syncromind/rental/templates/base/config.tpl 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/rental/templates/base/config.tpl 2015-06-10
12:32:10 UTC (rev 13400)
@@ -169,6 +169,16 @@
</table>
</td>
</tr>
+ <tr class="row_on">
+ <td valign = 'top'>{lang_default_billing_term}:</td>
+ <td>
+ <!--to be able to blank the setting - need an
empty value-->
+ <!--input type = 'hidden'
name="newsettings[default_billing_term]" value=""-->
+ <table>
+ {hook_default_billing_term}
+ </table>
+ </td>
+ </tr>
<!-- END body -->
<!-- BEGIN footer -->
Modified: branches/dev-syncromind/rental/templates/base/contract.php
===================================================================
--- branches/dev-syncromind/rental/templates/base/contract.php 2015-06-10
12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/rental/templates/base/contract.php 2015-06-10
12:32:10 UTC (rev 13400)
@@ -319,7 +319,11 @@
</dt>
<dd>
<?php
- $executive_officer =
$contract->get_executive_officer_id();
+ if(!$executive_officer =
$contract->get_executive_officer_id())
+ {
+ $executive_officer =
$GLOBALS['phpgw_info']['user']['account_id'];
+ }
+
if($editable)
{
$location_name =
$contract->get_field_of_responsibility_name();
@@ -440,7 +444,11 @@
</dt>
<dd>
<?php
- $current_term_id =
$contract->get_term_id();
+ if(!$current_term_id =
$contract->get_term_id())
+ {
+ $current_term_id =
$config->config_data['default_billing_term'];
+ }
+
if ($editable)
{
?>
Modified: branches/dev-syncromind/set_box.php
===================================================================
--- branches/dev-syncromind/set_box.php 2015-06-10 12:22:05 UTC (rev 13399)
+++ branches/dev-syncromind/set_box.php 2015-06-10 12:32:10 UTC (rev 13400)
@@ -73,29 +73,29 @@
$curr_position =
$GLOBALS['phpgw']->common->find_portal_order((int) $_GET['app']);
$max_count =
count($GLOBALS['phpgw_info']['user']['preferences']['portal_order']) - 1;
$offset = -1;
- if($curr_position == 0)
+ if($curr_position == 0) // already on top
{
- $new_order = $max_count;
+// $new_order = $max_count;
}
else
{
$new_order = $curr_position + $offset;
+
move_boxes($curr_position,$new_order,$offset,0,$max_count);
}
-
move_boxes($curr_position,$new_order,$offset,0,$max_count);
break;
case 'down':
$curr_position =
$GLOBALS['phpgw']->common->find_portal_order((int) $_GET['app']);
$max_count =
count($GLOBALS['phpgw_info']['user']['preferences']['portal_order']) - 1;
$offset = 1;
- if($curr_position == $max_count)
+ if($curr_position == $max_count) // already last
{
$new_order = 0;
}
else
{
$new_order = $curr_position + $offset;
+
move_boxes($curr_position,$new_order,$offset,$max_count,0);
}
-
move_boxes($curr_position,$new_order,$offset,$max_count,0);
break;
case 'edit':
case 'question':
Modified: branches/dev-syncromind/setup/applications.php
===================================================================
--- branches/dev-syncromind/setup/applications.php 2015-06-10 12:22:05 UTC
(rev 13399)
+++ branches/dev-syncromind/setup/applications.php 2015-06-10 12:32:10 UTC
(rev 13400)
@@ -2,7 +2,7 @@
/**
* Setup
*
- * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @copyright Copyright (C) 2000-2015 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package setup
* @version $Id$
@@ -523,7 +523,7 @@
{
$setup_tpl->set_var('bg_class', "row_install_{$row}");
$status =
"[{$value['status']}] " . lang('Please install');
- if (
isset($value['tables']) && is_array($value['tables']) &&
$GLOBALS['phpgw_setup']->detection->check_app_tables($value['name'],True))
+ if (
isset($value['tables']) && is_array($value['tables']) && $value['tables'] &&
$GLOBALS['phpgw_setup']->detection->check_app_tables($value['name'],True))
{
// Some tables
missing
$setup_tpl->set_var('bg_class', "row_err_gen_{$row}");
@@ -608,4 +608,4 @@
$setup_tpl->pparse('out','app_footer');
$setup_tpl->pparse('out','footer');
$GLOBALS['phpgw_setup']->html->show_footer();
- }
+ }
\ No newline at end of file
Modified: branches/dev-syncromind/setup/applist.php
===================================================================
--- branches/dev-syncromind/setup/applist.php 2015-06-10 12:22:05 UTC (rev
13399)
+++ branches/dev-syncromind/setup/applist.php 2015-06-10 12:32:10 UTC (rev
13400)
@@ -103,5 +103,4 @@
$r = $c->send($logout);
$v = $r->value();
- $GLOBALS['phpgw_setup']->html->show_footer();
-?>
+ $GLOBALS['phpgw_setup']->html->show_footer();
\ No newline at end of file
Modified: branches/dev-syncromind/setup/bulk.php
===================================================================
--- branches/dev-syncromind/setup/bulk.php 2015-06-10 12:22:05 UTC (rev
13399)
+++ branches/dev-syncromind/setup/bulk.php 2015-06-10 12:32:10 UTC (rev
13400)
@@ -164,5 +164,4 @@
$setup_tpl->set_var('submit',lang('Upgrade'));
$setup_tpl->set_var('cancel',lang('Cancel'));
$setup_tpl->pparse('out','T_footer');
- $GLOBALS['phpgw_setup']->html->show_footer();
-?>
+ $GLOBALS['phpgw_setup']->html->show_footer();
\ No newline at end of file
Modified: branches/dev-syncromind/setup/config.php
===================================================================
--- branches/dev-syncromind/setup/config.php 2015-06-10 12:22:05 UTC (rev
13399)
+++ branches/dev-syncromind/setup/config.php 2015-06-10 12:32:10 UTC (rev
13400)
@@ -298,5 +298,4 @@
$setup_tpl->set_var('lang_cancel',lang('Cancel'));
$setup_tpl->pparse('out','T_config_post_script');
- $GLOBALS['phpgw_setup']->html->show_footer();
-?>
+ $GLOBALS['phpgw_setup']->html->show_footer();
\ No newline at end of file
Modified: branches/dev-syncromind/setup/index.php
===================================================================
--- branches/dev-syncromind/setup/index.php 2015-06-10 12:22:05 UTC (rev
13399)
+++ branches/dev-syncromind/setup/index.php 2015-06-10 12:32:10 UTC (rev
13400)
@@ -2,7 +2,7 @@
/**
* phpGroupWare Setup - http://phpGroupWare.org
*
- * @copyright Portions Copyright (C) 2000-2005 Free Software Foundation,
Inc. http://www.fsf.org/
+ * @copyright Portions Copyright (C) 2000-2015 Free Software Foundation,
Inc. http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package setup
* @version $Id$
@@ -50,8 +50,12 @@
$setup_tpl->set_block('T_login_stage_header','B_multi_domain','V_multi_domain');
$setup_tpl->set_block('T_login_stage_header','B_single_domain','V_single_domain');
-
$setup_tpl->set_block('T_setup_svn_blocks','B_svn_stage_1','V_svn_stage_1');
-
$setup_tpl->set_block('T_setup_svn_blocks','B_svn_stage_2','V_svn_stage_2');
+ if(false)//enable svn check from setup
+ {
+
$setup_tpl->set_block('T_setup_svn_blocks','B_svn_stage_1','V_svn_stage_1');
+
$setup_tpl->set_block('T_setup_svn_blocks','B_svn_stage_2','V_svn_stage_2');
+ $setup_tpl->set_var('svn_step_text',lang('Step 0 - check for
updates. The user %1 has to be member of sudoers and have a
password',getenv('APACHE_RUN_USER')));
+ }
$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_1','V_db_stage_1');
$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_2','V_db_stage_2');
@@ -195,7 +199,6 @@
$setup_tpl->set_var('img_incomplete', $incomplete);
$setup_tpl->set_var('img_completed', $completed);
- $setup_tpl->set_var('svn_step_text',lang('Step 0 - check for updates.
The user %1 has to be member of sudoers and have a
password',getenv('APACHE_RUN_USER')));
$setup_tpl->set_var('db_step_text',lang('Step 1 - Simple Application
Management'));
switch($GLOBALS['phpgw_info']['setup']['stage']['svn'])
Modified: branches/dev-syncromind/setup/ldap.php
===================================================================
--- branches/dev-syncromind/setup/ldap.php 2015-06-10 12:22:05 UTC (rev
13399)
+++ branches/dev-syncromind/setup/ldap.php 2015-06-10 12:32:10 UTC (rev
13400)
@@ -74,5 +74,4 @@
$setup_tpl->pfp('out','cancel_only');
$setup_tpl->pfp('out','footer');
- $GLOBALS['phpgw_setup']->html->show_footer();
-?>
+ $GLOBALS['phpgw_setup']->html->show_footer();
\ No newline at end of file
Modified: branches/dev-syncromind/setup/ldapexport.php
===================================================================
--- branches/dev-syncromind/setup/ldapexport.php 2015-06-10 12:22:05 UTC
(rev 13399)
+++ branches/dev-syncromind/setup/ldapexport.php 2015-06-10 12:32:10 UTC
(rev 13400)
@@ -349,4 +349,3 @@
$setup_tpl->pfp('out','footer');
$GLOBALS['phpgw_setup']->html->show_footer();
-?>
Modified: branches/dev-syncromind/setup/ldapimport.php
===================================================================
--- branches/dev-syncromind/setup/ldapimport.php 2015-06-10 12:22:05 UTC
(rev 13399)
+++ branches/dev-syncromind/setup/ldapimport.php 2015-06-10 12:32:10 UTC
(rev 13400)
@@ -537,5 +537,4 @@
$setup_tpl->pfp('out','submit');
$setup_tpl->pfp('out','footer');
- $GLOBALS['phpgw_setup']->html->show_footer();
-?>
+ $GLOBALS['phpgw_setup']->html->show_footer();
\ No newline at end of file
Modified: branches/dev-syncromind/setup/ldapmodify.php
===================================================================
--- branches/dev-syncromind/setup/ldapmodify.php 2015-06-10 12:22:05 UTC
(rev 13399)
+++ branches/dev-syncromind/setup/ldapmodify.php 2015-06-10 12:32:10 UTC
(rev 13400)
@@ -430,4 +430,3 @@
$setup_tpl->pfp('out','footer');
$GLOBALS['phpgw_setup']->html->show_footer();
-?>
Modified: branches/dev-syncromind/setup/schematoy.php
===================================================================
--- branches/dev-syncromind/setup/schematoy.php 2015-06-10 12:22:05 UTC (rev
13399)
+++ branches/dev-syncromind/setup/schematoy.php 2015-06-10 12:32:10 UTC (rev
13400)
@@ -281,4 +281,3 @@
$GLOBALS['setup_tpl']->pparse('out','app_footer');
$GLOBALS['setup_tpl']->pparse('out','footer');
$GLOBALS['phpgw_setup']->html->show_footer();
-?>
Modified: branches/dev-syncromind/setup/sqltoarray.php
===================================================================
--- branches/dev-syncromind/setup/sqltoarray.php 2015-06-10 12:22:05 UTC
(rev 13399)
+++ branches/dev-syncromind/setup/sqltoarray.php 2015-06-10 12:32:10 UTC
(rev 13400)
@@ -301,4 +301,3 @@
}
$setup_tpl->pfp('out','appfooter');
}
-?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13400] Syncromind: Merge 13346:13399 from trunk,
Sigurd Nes <=