[limb-svn] r5835 - in 2.x/trunk: shared/calendar src src/actions src/controllers src/datasource src/template/components src/template/components/form src/tree
svn at limb-project.com
svn at limb-project.com
Tue May 8 16:45:27 MSD 2007
Author: 3dmax
Date: 2007-05-08 16:45:27 +0400 (Tue, 08 May 2007)
New Revision: 5835
URL: http://fisheye.limb-project.com/changelog/limb/?cs=5835
Added:
2.x/trunk/shared/calendar/arr_next.gif
2.x/trunk/shared/calendar/arr_prev.gif
Modified:
2.x/trunk/shared/calendar/en.js
2.x/trunk/shared/calendar/ru.js
2.x/trunk/src/access_policy.class.php
2.x/trunk/src/actions/form_site_object_action.class.php
2.x/trunk/src/controllers/site_object_controller.class.php
2.x/trunk/src/datasource/fetch_sub_branch_datasource.class.php
2.x/trunk/src/fetcher.class.php
2.x/trunk/src/template/components/datasource_component.class.php
2.x/trunk/src/template/components/form/options_form_element.class.php
2.x/trunk/src/tree/materialized_path_tree.class.php
Log:
-- small calendar fix
-- couple fixes for PHP 4.4.4
Added: 2.x/trunk/shared/calendar/arr_next.gif
===================================================================
(Binary files differ)
Property changes on: 2.x/trunk/shared/calendar/arr_next.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: 2.x/trunk/shared/calendar/arr_prev.gif
===================================================================
(Binary files differ)
Property changes on: 2.x/trunk/shared/calendar/arr_prev.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: 2.x/trunk/shared/calendar/en.js
===================================================================
--- 2.x/trunk/shared/calendar/en.js 2007-05-08 12:34:32 UTC (rev 5834)
+++ 2.x/trunk/shared/calendar/en.js 2007-05-08 12:45:27 UTC (rev 5835)
@@ -36,8 +36,8 @@
var gsCalTitle="gMonths[gCurMonth[1]-1]+' '+gCurMonth[0]"; // dynamic statement to be eval-ed as the title when giDCStyle>0.
var gbDCSeq=true; // (effective only when giDCStyle is 0) true: show month box before year box; false: vice-versa;
var gsYearInBox="i"; // dynamic statement to be eval-ed as the text shown in the year box. e.g. "'A.D.'+i" will show "A.D.2001"
-var gsNavPrev="<img src='" + parent.HTTP_SHARED_PATH + "images/arr_prev.gif' border=0 width=11 height=11 onclick='fPrevMonth();this.blur();'>"; // the content of the left month navigator
-var gsNavNext="<img src='" + parent.HTTP_SHARED_PATH + "images/arr_next.gif' border=0 width=11 height=11 onclick='fNextMonth();this.blur();'>"; // the content of the right month navigator
+var gsNavPrev="<img src='" + parent.HTTP_SHARED_PATH + "calendar/arr_prev.gif' border=0 width=11 height=11 onclick='fPrevMonth();this.blur();'>"; // the content of the left month navigator
+var gsNavNext="<img src='" + parent.HTTP_SHARED_PATH + "calendar/arr_next.gif' border=0 width=11 height=11 onclick='fNextMonth();this.blur();'>"; // the content of the right month navigator
var gbHideBottom=false; // true: hide the bottom section; false: show it with gsBottom.
var gsBottom="<A href='javascript:void(0)' class='Today' onclick='if(!NN4)this.blur();if(!fSetDate(gToday[0],gToday[1],gToday[2]))alert(\"You may not pick this day!\");return false;' onmouseover='return true;' title='Today'>Today : "+gToday[2]+" "+gMonths[gToday[1]-1]+" "+gToday[0]+"</A>"; // the content of the bottom section.
Modified: 2.x/trunk/shared/calendar/ru.js
===================================================================
--- 2.x/trunk/shared/calendar/ru.js 2007-05-08 12:34:32 UTC (rev 5834)
+++ 2.x/trunk/shared/calendar/ru.js 2007-05-08 12:45:27 UTC (rev 5835)
@@ -36,8 +36,8 @@
var gsCalTitle="gMonths[gCurMonth[1]-1]+' '+gCurMonth[0]"; // dynamic statement to be eval-ed as the title when giDCStyle>0.
var gbDCSeq=true; // (effective only when giDCStyle is 0) true: show month box before year box; false: vice-versa;
var gsYearInBox="i"; // dynamic statement to be eval-ed as the text shown in the year box. e.g. "'A.D.'+i" will show "A.D.2001"
-var gsNavPrev="<img src='" + parent.HTTP_SHARED_PATH + "images/arr_prev.gif' border=0 width=11 height=11 onclick='fPrevMonth();this.blur();'>"; // the content of the left month navigator
-var gsNavNext="<img src='" + parent.HTTP_SHARED_PATH + "images/arr_next.gif' border=0 width=11 height=11 onclick='fNextMonth();this.blur();'>"; // the content of the right month navigator
+var gsNavPrev="<img src='" + parent.HTTP_SHARED_PATH + "calendar/arr_prev.gif' border=0 width=11 height=11 onclick='fPrevMonth();this.blur();'>"; // the content of the left month navigator
+var gsNavNext="<img src='" + parent.HTTP_SHARED_PATH + "calendar/arr_next.gif' border=0 width=11 height=11 onclick='fNextMonth();this.blur();'>"; // the content of the right month navigator
var gbHideBottom=false; // true: hide the bottom section; false: show it with gsBottom.
var gsBottom="<A href='javascript:void(0)' class='Today' onclick='if(!NN4)this.blur();if(!fSetDate(gToday[0],gToday[1],gToday[2]))alert(\"Нельзя выбрать эту дату!\");return false;' onmouseover='return true;' title='Today'>Сегодня : "+gToday[2]+" "+gMonths[gToday[1]-1]+" "+gToday[0]+"</A>"; // the content of the bottom section.
Modified: 2.x/trunk/src/access_policy.class.php
===================================================================
--- 2.x/trunk/src/access_policy.class.php 2007-05-08 12:34:32 UTC (rev 5834)
+++ 2.x/trunk/src/access_policy.class.php 2007-05-08 12:45:27 UTC (rev 5835)
@@ -212,7 +212,8 @@
//for mocking
function &_get_controller($controller_name)
{
- return site_object_controller :: create($controller_name);
+ $controller =& site_object_controller :: create($controller_name);
+ return $controller;
}
function _get_controller_accessible_actions($controller_id)
Modified: 2.x/trunk/src/actions/form_site_object_action.class.php
===================================================================
--- 2.x/trunk/src/actions/form_site_object_action.class.php 2007-05-08 12:34:32 UTC (rev 5834)
+++ 2.x/trunk/src/actions/form_site_object_action.class.php 2007-05-08 12:45:27 UTC (rev 5835)
@@ -49,7 +49,8 @@
function & get_site_object()
{
- return site_object_factory :: create($this->site_object_class_name);
+ $site_object =& site_object_factory :: create($this->site_object_class_name);
+ return $site_object;
}
}
?>
\ No newline at end of file
Modified: 2.x/trunk/src/controllers/site_object_controller.class.php
===================================================================
--- 2.x/trunk/src/controllers/site_object_controller.class.php 2007-05-08 12:34:32 UTC (rev 5834)
+++ 2.x/trunk/src/controllers/site_object_controller.class.php 2007-05-08 12:45:27 UTC (rev 5835)
@@ -217,9 +217,11 @@
function &_create_action($action_path)
{
if(is_array($action_path))
- return action_factory :: create($action_path[0], array_slice($action_path, 1));
+ $action =& action_factory :: create($action_path[0], array_slice($action_path, 1));
else
- return action_factory :: create($action_path);
+ $action =& action_factory :: create($action_path);
+
+ return $action;
}
function & get_view()
Modified: 2.x/trunk/src/datasource/fetch_sub_branch_datasource.class.php
===================================================================
--- 2.x/trunk/src/datasource/fetch_sub_branch_datasource.class.php 2007-05-08 12:34:32 UTC (rev 5834)
+++ 2.x/trunk/src/datasource/fetch_sub_branch_datasource.class.php 2007-05-08 12:45:27 UTC (rev 5835)
@@ -21,7 +21,8 @@
function & _fetch(&$counter, $params)
{
- return fetch_sub_branch($params['path'], $params['loader_class_name'], $counter, $params, $params['fetch_method']);
+ $result =& fetch_sub_branch($params['path'], $params['loader_class_name'], $counter, $params, $params['fetch_method']);
+ return $result;
}
}
?>
\ No newline at end of file
Modified: 2.x/trunk/src/fetcher.class.php
===================================================================
--- 2.x/trunk/src/fetcher.class.php 2007-05-08 12:34:32 UTC (rev 5834)
+++ 2.x/trunk/src/fetcher.class.php 2007-05-08 12:45:27 UTC (rev 5835)
@@ -237,7 +237,8 @@
if(!$node =& $mapper->get_mapped_node($uri))
return $object_data;
- return $this->fetch_one_by_node_id($node['id']);
+ $result =& $this->fetch_one_by_node_id($node['id']);
+ return $result;
}
function _assign_paths(&$objects_array, $append = '')
@@ -270,49 +271,65 @@
function & fetch_requested_object($request = null)
{
$fetcher =& fetcher :: instance();
- return $fetcher->fetch_requested_object($request);
+
+ $result =& $fetcher->fetch_requested_object($request);
+ return $result;
}
function & fetch_one_by_id($object_id)
{
$fetcher =& fetcher :: instance();
- return $fetcher->fetch_one_by_id($object_id);
+
+ $result =& $fetcher->fetch_one_by_id($object_id);
+ return $result;
}
function & fetch_one_by_node_id($node_id)
{
$fetcher =& fetcher :: instance();
- return $fetcher->fetch_one_by_node_id($node_id);
+
+ $result =& $fetcher->fetch_one_by_node_id($node_id);
+ return $result;
}
function & fetch_one_by_path($path)
{
$fetcher =& fetcher :: instance();
- return $fetcher->fetch_one_by_path($path);
+
+ $result =& $fetcher->fetch_one_by_path($path);
+ return $result;
}
function & fetch($loader_class_name, &$counter, $params = array(), $fetch_method = 'fetch')
{
$fetcher =& fetcher :: instance();
- return $fetcher->fetch($loader_class_name, $counter, $params, $fetch_method);
+
+ $result =& $fetcher->fetch($loader_class_name, $counter, $params, $fetch_method);
+ return $result;
}
function & fetch_sub_branch($path, $loader_class_name, &$counter, $params = array(), $fetch_method = 'fetch_by_ids')
{
$fetcher =& fetcher :: instance();
- return $fetcher->fetch_sub_branch($path, $loader_class_name, $counter, $params, $fetch_method);
+
+ $result =& $fetcher->fetch_sub_branch($path, $loader_class_name, $counter, $params, $fetch_method);
+ return $result;
}
function & fetch_by_ids($object_ids, $loader_class_name, &$counter, $params = array(), $fetch_method = 'fetch_by_ids')
{
$fetcher =& fetcher :: instance();
- return $fetcher->fetch_by_ids($object_ids, $loader_class_name, $counter, $params, $fetch_method);
+
+ $result =& $fetcher->fetch_by_ids($object_ids, $loader_class_name, $counter, $params, $fetch_method);
+ return $result;
}
function & fetch_by_node_ids($node_ids, $loader_class_name, &$counter, $params = array(), $fetch_method = 'fetch_by_ids')
{
$fetcher =& fetcher :: instance();
- return $fetcher->fetch_by_node_ids($node_ids, $loader_class_name, $counter, $params, $fetch_method);
+
+ $result =& $fetcher->fetch_by_node_ids($node_ids, $loader_class_name, $counter, $params, $fetch_method);
+ return $result;
}
function & wrap_with_site_object($fetched_data)
Modified: 2.x/trunk/src/template/components/datasource_component.class.php
===================================================================
--- 2.x/trunk/src/template/components/datasource_component.class.php 2007-05-08 12:34:32 UTC (rev 5834)
+++ 2.x/trunk/src/template/components/datasource_component.class.php 2007-05-08 12:45:27 UTC (rev 5835)
@@ -33,7 +33,8 @@
return $ds;
}
- return $datasource->get_dataset($this->total_count, $this->_get_params_array());
+ $ds =& $datasource->get_dataset($this->total_count, $this->_get_params_array());
+ return $ds;
}
function get_total_count()
Modified: 2.x/trunk/src/template/components/form/options_form_element.class.php
===================================================================
--- 2.x/trunk/src/template/components/form/options_form_element.class.php 2007-05-08 12:34:32 UTC (rev 5834)
+++ 2.x/trunk/src/template/components/form/options_form_element.class.php 2007-05-08 12:45:27 UTC (rev 5835)
@@ -185,7 +185,9 @@
{
load_class(LIMB_DIR . '/src/datasource/datasource_factory.class.php');
$datasource_path = $this->get_attribute('options_datasource');
- return datasource_factory :: create($datasource_path);
+
+ $ds =& datasource_factory :: create($datasource_path);
+ return $ds;
}
}
Modified: 2.x/trunk/src/tree/materialized_path_tree.class.php
===================================================================
--- 2.x/trunk/src/tree/materialized_path_tree.class.php 2007-05-08 12:34:32 UTC (rev 5834)
+++ 2.x/trunk/src/tree/materialized_path_tree.class.php 2007-05-08 12:45:27 UTC (rev 5835)
@@ -316,7 +316,8 @@
$this->_node_table, $parent['id'],
$this->_add_sql($add_sql, 'append'));
- return $this->_get_result_set($sql);
+ $children =& $this->_get_result_set($sql);
+ return $children;
}
function count_children($node, $add_sql=array())
@@ -449,7 +450,8 @@
if(!$parent_node = $this->get_node_by_path($path))
return $nodes;
- return $this->get_sub_branch($parent_node, $depth, $include_parent, $normalize_expanded_parents, $only_parents, $add_sql);
+ $result =& $this->get_sub_branch($parent_node, $depth, $include_parent, $normalize_expanded_parents, $only_parents, $add_sql);
+ return $result;
}
/**
@@ -559,7 +561,8 @@
'append' => array(' AND ' . sql_in('id', $ids))
);
- return $this->get_all_nodes($add_sql);
+ $nodes =& $this->get_all_nodes($add_sql);
+ return $nodes;
}
function get_max_child_identifier($node)
More information about the limb-svn
mailing list