[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14956] activitycalendar: prepare for php 7
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14956] activitycalendar: prepare for php 7 |
|
Date: |
Sat, 30 Apr 2016 15:23:44 +0000 |
Revision: 14956
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14956
Author: sigurdne
Date: 2016-04-30 15:23:44 +0000 (Sat, 30 Apr 2016)
Log Message:
-----------
activitycalendar: prepare for php 7
Modified Paths:
--------------
trunk/activitycalendar/inc/class.soactivity.inc.php
trunk/activitycalendar/inc/class.soarena.inc.php
trunk/activitycalendar/inc/class.socommon.inc.php
trunk/activitycalendar/inc/class.socontactperson.inc.php
trunk/activitycalendar/inc/class.sogroup.inc.php
trunk/activitycalendar/inc/class.soorganization.inc.php
trunk/activitycalendar/inc/class.uiactivities.inc.php
trunk/activitycalendar/inc/class.uiarena.inc.php
trunk/activitycalendar/inc/class.uidashboard.inc.php
trunk/activitycalendar/inc/class.uiorganization.inc.php
trunk/activitycalendar/inc/model/class.model.inc.php
trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2016-04-30 15:22:35 UTC
(rev 14955)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2016-04-30 15:23:44 UTC
(rev 14956)
@@ -87,14 +87,14 @@
* the party is involved in.
*
* @param string $sort_field
- * @param boolean $ascending
+ * @param bool $ascending
* @param string $search_for
* @param string $search_type
* @param array $filters
- * @param boolean $return_count
+ * @param bool $return_count
* @return string SQL
*/
- protected function get_query( string $sort_field, boolean
$ascending, string $search_for, string $search_type, array $filters, boolean
$return_count )
+ protected function get_query( string $sort_field, bool
$ascending, string $search_for, string $search_type, array $filters, bool
$return_count )
{
$clauses = array('1=1');
@@ -336,7 +336,7 @@
* Update the database values for an existing activity object.
*
* @param $activity the activity to be updated
- * @return boolean true if successful, false otherwise
+ * @return bool true if successful, false otherwise
*/
function update( $activity )
{
Modified: trunk/activitycalendar/inc/class.soarena.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soarena.inc.php 2016-04-30 15:22:35 UTC
(rev 14955)
+++ trunk/activitycalendar/inc/class.soarena.inc.php 2016-04-30 15:23:44 UTC
(rev 14956)
@@ -28,14 +28,14 @@
*
*
* @param string $sort_field
- * @param boolean $ascending
+ * @param bool $ascending
* @param string $search_for
* @param string $search_type
* @param array $filters
- * @param boolean $return_count
+ * @param bool $return_count
* @return string SQL
*/
- protected function get_query( string $sort_field, boolean
$ascending, string $search_for, string $search_type, array $filters, boolean
$return_count )
+ protected function get_query( string $sort_field, bool
$ascending, string $search_for, string $search_type, array $filters, bool
$return_count )
{
$clauses = array('1=1');
@@ -266,7 +266,7 @@
* Update the database values for an existing arena object.
*
* @param $arena the arena to be updated
- * @return boolean true if successful, false otherwise
+ * @return bool true if successful, false otherwise
*/
function update( $arena )
{
Modified: trunk/activitycalendar/inc/class.socommon.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.socommon.inc.php 2016-04-30 15:22:35 UTC
(rev 14955)
+++ trunk/activitycalendar/inc/class.socommon.inc.php 2016-04-30 15:23:44 UTC
(rev 14956)
@@ -57,16 +57,16 @@
{
if ($type == 'bool')
{
- return (boolean)$value;
+ return (bool)$value;
}
+ elseif ($type == 'int')
+ {
+ return (int)$value;
+ }
elseif ($value === null || $value == 'NULL')
{
return null;
}
- elseif ($type == 'int')
- {
- return intval($value);
- }
elseif ($type == 'float')
{
return floatval($value);
@@ -106,7 +106,7 @@
*/
public function get_single( int $id )
{
- $objects = $this->get(null, null, null, null, null,
null, array($this->get_id_field_name() => $id));
+ $objects = $this->get(0, 0, '', false, '', '',
array($this->get_id_field_name() => $id));
if (count($objects) > 0)
{
$keys = array_keys($objects);
@@ -129,7 +129,7 @@
* @param $start_index int with index of first object.
* @param $num_of_objects int with max number of objects to
return.
* @param $sort_field string representing the object field to
sort on.
- * @param $ascending boolean true for ascending sort on sort
field, false
+ * @param $ascending bool true for ascending sort on sort
field, false
* for descending.
* @param $search_for string with free text search query.
* @param $search_type string with the query type.
@@ -137,7 +137,7 @@
* @return array of objects. May return an empty
* array, never null. The array keys are the respective index
numbers.
*/
- public function get( int $start_index, int $num_of_objects,
string $sort_field, boolean $ascending, string $search_for, string
$search_type, array $filters )
+ public function get( int $start_index, int $num_of_objects,
string $sort_field, bool $ascending, string $search_for, string $search_type,
array $filters )
{
$results = array(); // Array to store result objects
$map = array(); // Array to hold number of records per
target object
@@ -261,7 +261,7 @@
*/
public function get_count( string $search_for, string
$search_type, array $filters )
{
- return $this->get_query_count($this->get_query(null,
null, $search_for, $search_type, $filters, true));
+ return $this->get_query_count($this->get_query('',
false, $search_for, $search_type, $filters, true));
}
/**
@@ -278,16 +278,16 @@
* @param $start_index int with index of first object.
* @param $num_of_objects int with max number of objects to
return.
* @param $sort_field string representing the object field to
sort on.
- * @param $ascending boolean true for ascending sort on sort
field, false
+ * @param $ascending bool true for ascending sort on sort
field, false
* for descending.
* @param $search_for string with free text search query.
* @param $search_type string with the query type.
* @param $filters array with key => value of filters.
- * @param $return_count boolean telling to return only the
count of the
+ * @param $return_count bool telling to return only the count
of the
* matching objects, or the objects themself.
* @return string with SQL.
*/
- protected abstract function get_query( string $sort_field,
boolean $ascending, string $search_for, string $search_type, array $filters,
boolean $return_count );
+ protected abstract function get_query( string $sort_field, bool
$ascending, string $search_for, string $search_type, array $filters, bool
$return_count );
protected abstract function populate( int $object_id, &$object
);
Modified: trunk/activitycalendar/inc/class.socontactperson.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.socontactperson.inc.php 2016-04-30
15:22:35 UTC (rev 14955)
+++ trunk/activitycalendar/inc/class.socontactperson.inc.php 2016-04-30
15:23:44 UTC (rev 14956)
@@ -29,14 +29,14 @@
* the party is involved in.
*
* @param string $sort_field
- * @param boolean $ascending
+ * @param bool $ascending
* @param string $search_for
* @param string $search_type
* @param array $filters
- * @param boolean $return_count
+ * @param bool $return_count
* @return string SQL
*/
- protected function get_query( string $sort_field, boolean
$ascending, string $search_for, string $search_type, array $filters, boolean
$return_count )
+ protected function get_query( string $sort_field, bool
$ascending, string $search_for, string $search_type, array $filters, bool
$return_count )
{
$clauses = array('1=1');
$table = "";
@@ -290,7 +290,7 @@
* Update the database values for an existing activity object.
*
* @param $activity the activity to be updated
- * @return boolean true if successful, false otherwise
+ * @return bool true if successful, false otherwise
*/
function update( $contact_person )
{
Modified: trunk/activitycalendar/inc/class.sogroup.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.sogroup.inc.php 2016-04-30 15:22:35 UTC
(rev 14955)
+++ trunk/activitycalendar/inc/class.sogroup.inc.php 2016-04-30 15:23:44 UTC
(rev 14956)
@@ -29,14 +29,14 @@
* the party is involved in.
*
* @param string $sort_field
- * @param boolean $ascending
+ * @param bool $ascending
* @param string $search_for
* @param string $search_type
* @param array $filters
- * @param boolean $return_count
+ * @param bool $return_count
* @return string SQL
*/
- protected function get_query( string $sort_field, boolean
$ascending, string $search_for, string $search_type, array $filters, boolean
$return_count )
+ protected function get_query( string $sort_field, bool
$ascending, string $search_for, string $search_type, array $filters, bool
$return_count )
{
$clauses = array('1=1');
@@ -176,7 +176,7 @@
* Update the database values for an existing party object.
*
* @param $party the party to be updated
- * @return boolean true if successful, false otherwise
+ * @return bool true if successful, false otherwise
*/
function update( $group )
{
Modified: trunk/activitycalendar/inc/class.soorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soorganization.inc.php 2016-04-30
15:22:35 UTC (rev 14955)
+++ trunk/activitycalendar/inc/class.soorganization.inc.php 2016-04-30
15:23:44 UTC (rev 14956)
@@ -34,14 +34,14 @@
* the party is involved in.
*
* @param string $sort_field
- * @param boolean $ascending
+ * @param bool $ascending
* @param string $search_for
* @param string $search_type
* @param array $filters
- * @param boolean $return_count
+ * @param bool $return_count
* @return string SQL
*/
- protected function get_query( string $sort_field, boolean
$ascending, string $search_for, string $search_type, array $filters, boolean
$return_count )
+ protected function get_query( string $sort_field, bool
$ascending, string $search_for, string $search_type, array $filters, bool
$return_count )
{
$clauses = array('1=1');
@@ -509,7 +509,7 @@
* Update the database values for an existing party object.
*
* @param $party the party to be updated
- * @return boolean true if successful, false otherwise
+ * @return bool true if successful, false otherwise
*/
function update_local( $organization )
{
Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php 2016-04-30
15:22:35 UTC (rev 14955)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php 2016-04-30
15:23:44 UTC (rev 14956)
@@ -473,19 +473,19 @@
{
$desc = substr($desc, 0, 254);
}
- $arenas = $this->so_arena->get(null, null,
'arena.arena_name', true, null, null, null);
+ $arenas = $this->so_arena->get(0, 0,
'arena.arena_name', true, '', '', array());
if ($activity->get_new_org())
{
$org_name =
$this->so_org->get_organization_name_local($activity->get_organization_id());
}
else
{
- $organizations = $this->so_org->get(null, null,
'org.name', true, null, null, null);
+ $organizations = $this->so_org->get(0, 0,
'org.name', true, '', '', array());
}
if ($new_group)
{
- $group_array = $this->so_group->get(null, null,
null, null, null, null, array(
+ $group_array = $this->so_group->get(0, 0, '',
false, '', '', array(
'group_id' =>
$activity->get_group_id(), 'new_groups' => 'true'));
//var_dump($group_array);
if (count($group_array) > 0)
@@ -498,7 +498,7 @@
}
else
{
- $groups = $this->so_group->get(null, null,
null, null, null, null, null);
+ $groups = $this->so_group->get();
}
if ($activity->get_new_org())
@@ -710,7 +710,7 @@
$sort_ascending = ($order[0]['dir'] == 'desc') ? false
: true;
// Form variables
$search_for = $search['value'];
- $search_type = phpgw::get_var('search_option');
+ $search_type = phpgw::get_var('search_option',
'string', 'REQUEST', '');
// Create an empty result set
$result_objects = array();
@@ -1355,7 +1355,7 @@
$returnHTML = "<option value='0'>Ingen gruppe
valgt</option>";
if ($org_id)
{
- $groups =
activitycalendar_sogroup::get_instance()->get(null, null, null, null, null,
null, array(
+ $groups =
activitycalendar_sogroup::get_instance()->get(0, 0, '', false, '', '', array(
'org_id' => $org_id));
foreach ($groups as $group)
{
Modified: trunk/activitycalendar/inc/class.uiarena.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiarena.inc.php 2016-04-30 15:22:35 UTC
(rev 14955)
+++ trunk/activitycalendar/inc/class.uiarena.inc.php 2016-04-30 15:23:44 UTC
(rev 14956)
@@ -239,7 +239,7 @@
$sort_ascending = ($order[0]['dir'] == 'desc') ? false
: true;
// Form variables
$search_for = $search['value'];
- $search_type = phpgw::get_var('search_option');
+ $search_type = phpgw::get_var('search_option',
'string', 'REQUEST', '');
// Create an empty result set
$result_objects = array();
Modified: trunk/activitycalendar/inc/class.uidashboard.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uidashboard.inc.php 2016-04-30
15:22:35 UTC (rev 14955)
+++ trunk/activitycalendar/inc/class.uidashboard.inc.php 2016-04-30
15:23:44 UTC (rev 14956)
@@ -254,7 +254,7 @@
if (!$changed_group && !$changed_org)
{
$filter_group = array('org_id'
=> $org_id);
- $result_groups =
activitycalendar_sogroup::get_instance()->get(null, null, $sort_field,
$sort_ascending, $search_for, $search_type, $filter_group);
+ $result_groups =
activitycalendar_sogroup::get_instance()->get(0, 0, $sort_field,
$sort_ascending, $search_for, $search_type, $filter_group);
foreach ($result_groups as
$result_group)
{
if
(isset($result_group))
@@ -295,7 +295,7 @@
$returnHTML = "<option value='0'>Ingen gruppe
valgt</option>";
if ($org_id)
{
- $groups =
activitycalendar_sogroup::get_instance()->get(null, null, null, null, null,
null, array(
+ $groups =
activitycalendar_sogroup::get_instance()->get(0, 0, '', false, '', '', array(
'org_id' => $org_id));
foreach ($groups as $group)
{
Modified: trunk/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiorganization.inc.php 2016-04-30
15:22:35 UTC (rev 14955)
+++ trunk/activitycalendar/inc/class.uiorganization.inc.php 2016-04-30
15:23:44 UTC (rev 14956)
@@ -352,7 +352,7 @@
public function index_json()
{
- $organizations =
activitycalendar_soorganization::get_instance()->get(); //get organizations
+ $organizations =
activitycalendar_soorganization::get_instance()->get(0, 0, '', false, '',
'',array()); //get organizations
array_walk($organizations["results"], array($this,
"_add_links"), "booking.uiorganization.show");
foreach ($organizations["results"] as &$organization)
@@ -381,7 +381,7 @@
$so_org =
activitycalendar_soorganization::get_instance();
$so_activity =
activitycalendar_soactivity::get_instance();
$so_contact =
activitycalendar_socontactperson::get_instance();
- $org_array = $so_org->get(null, null, null, null, null,
null, array('id' => $id,
+ $org_array = $so_org->get(0, 0, '', false, '', '',
array('id' => $id,
'changed_orgs' => 'true'));
if (count($org_array) > 0)
{
@@ -456,7 +456,7 @@
$so_org =
activitycalendar_soorganization::get_instance();
$so_contact =
activitycalendar_socontactperson::get_instance();
- $org_array = $so_org->get(null, null, null, null, null,
null, array('id' => $id,
+ $org_array = $so_org->get(0, 0, '', false, '', '',
array('id' => $id,
'changed_orgs' => 'true'));
if (count($org_array) > 0)
{
@@ -543,7 +543,7 @@
$sort_ascending = ($order[0]['dir'] == 'desc') ? false
: true;
// Form variables
$search_for = $search['value'];
- $search_type = phpgw::get_var('search_option');
+ $search_type = phpgw::get_var('search_option',
'string', 'REQUEST', '');
// Create an empty result set
$result_objects = array();
@@ -580,6 +580,7 @@
break;
default: // ... get all parties of a given type
//$filters = array('party_type' =>
phpgw::get_var('party_type'), 'active' => phpgw::get_var('active'));
+ $filters = array();
break;
}
if ($changed_group)
@@ -607,7 +608,7 @@
if (!$changed_group && !$changed_org)
{
$filter_group = array('org_id'
=> $org_id);
- $result_groups =
activitycalendar_sogroup::get_instance()->get(null, null, $sort_field,
$sort_ascending, $search_for, $search_type, $filter_group);
+ $result_groups =
activitycalendar_sogroup::get_instance()->get(0, 0, $sort_field,
$sort_ascending, $search_for, $search_type, $filter_group);
foreach ($result_groups as
$result_group)
{
if
(isset($result_group))
@@ -651,7 +652,7 @@
$returnHTML = "<option value='0'>Ingen gruppe
valgt</option>";
if ($org_id)
{
- $groups =
activitycalendar_sogroup::get_instance()->get(null, null, null, null, null,
null, array(
+ $groups =
activitycalendar_sogroup::get_instance()->get(0, 0, '', false, '', '', array(
'org_id' => $org_id));
foreach ($groups as $group)
{
Modified: trunk/activitycalendar/inc/model/class.model.inc.php
===================================================================
--- trunk/activitycalendar/inc/model/class.model.inc.php 2016-04-30
15:22:35 UTC (rev 14955)
+++ trunk/activitycalendar/inc/model/class.model.inc.php 2016-04-30
15:23:44 UTC (rev 14956)
@@ -99,7 +99,7 @@
* in order to validate against the standard database rules.
The subclasses can in addition
* add their own specific validation logic.
*
- * @return boolean true if the object is valid, false otherwise
+ * @return bool true if the object is valid, false otherwise
*/
public function validates()
{
Modified: trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
--- trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2016-04-30
15:22:35 UTC (rev 14955)
+++ trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2016-04-30
15:23:44 UTC (rev 14956)
@@ -1193,7 +1193,7 @@
if ($org_id)
{
$group_html[] = "<option value='new_group'>Ny
gruppe</option>";
- $groups =
activitycalendar_sogroup::get_instance()->get(null, null, null, null, null,
null, array(
+ $groups =
activitycalendar_sogroup::get_instance()->get(0, 0, '', false, '', '', array(
'org_id' => $org_id));
foreach ($groups as $group)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14956] activitycalendar: prepare for php 7,
Sigurd Nes <=