[limb-svn] r5973 - in 2.x/trunk: design/templates/site_param_object shared src/actions/poll src/actions/site_structure src/image src/stats

[svn at limb-project.com]

Author: 3dmax
Date: 2007-06-08 15:47:59 +0400 (Fri, 08 Jun 2007)
New Revision: 5973
URL: http://fisheye.limb-project.com/changelog/limb/?cs=5973

Modified:
   2.x/trunk/design/templates/site_param_object/admin_display.html
   2.x/trunk/shared/
   2.x/trunk/src/actions/poll/create_poll_action.class.php
   2.x/trunk/src/actions/poll/edit_poll_action.class.php
   2.x/trunk/src/actions/site_structure/node_select_action.class.php
   2.x/trunk/src/image/image_gd.class.php
   2.x/trunk/src/stats/stats_routes_report.class.php
Log:
-- minor changes

Modified: 2.x/trunk/design/templates/site_param_object/admin_display.html
===================================================================
--- 2.x/trunk/design/templates/site_param_object/admin_display.html	2007-06-08 11:40:34 UTC (rev 5972)
+++ 2.x/trunk/design/templates/site_param_object/admin_display.html	2007-06-08 11:47:59 UTC (rev 5973)
@@ -1,8 +1,7 @@
 <core:WRAP file="/admin/site_management_page.html" placeholder="content">
 
-<fetch:MAPPED>
-<core:INCLUDE file="/admin/jip/full.html">
-</fetch:MAPPED>
+<core:INCLUDE file="/admin/include/page_data.html">
+
 <br>
 <table>
 <tr>


Property changes on: 2.x/trunk/shared
___________________________________________________________________
Name: svn:ignore
   + FCKeditor
FCKeditor
FCKeditor


Modified: 2.x/trunk/src/actions/poll/create_poll_action.class.php
===================================================================
--- 2.x/trunk/src/actions/poll/create_poll_action.class.php	2007-06-08 11:40:34 UTC (rev 5972)
+++ 2.x/trunk/src/actions/poll/create_poll_action.class.php	2007-06-08 11:47:59 UTC (rev 5973)
@@ -38,6 +38,7 @@
   {
     parent :: _init_validator($request);
 
+    $this->validator->add_rule($v1 = array(LIMB_DIR . '/src/validators/rules/required_rule', 'title'));
     $this->validator->add_rule($v1 = array(LIMB_DIR . '/src/validators/rules/required_rule', 'start_date'));
     $this->validator->add_rule($v2 = array(LIMB_DIR . '/src/validators/rules/required_rule', 'finish_date'));
     $this->validator->add_rule($v3 = array(LIMB_DIR . '/src/validators/rules/required_rule', 'restriction'));

Modified: 2.x/trunk/src/actions/poll/edit_poll_action.class.php
===================================================================
--- 2.x/trunk/src/actions/poll/edit_poll_action.class.php	2007-06-08 11:40:34 UTC (rev 5972)
+++ 2.x/trunk/src/actions/poll/edit_poll_action.class.php	2007-06-08 11:47:59 UTC (rev 5973)
@@ -38,6 +38,7 @@
   {
     parent :: _init_validator($request);
 
+    $this->validator->add_rule($v3 = array(LIMB_DIR . '/src/validators/rules/required_rule', 'title'));
     $this->validator->add_rule($v1 = array(LIMB_DIR . '/src/validators/rules/required_rule', 'start_date'));
     $this->validator->add_rule($v2 = array(LIMB_DIR . '/src/validators/rules/required_rule', 'finish_date'));
     $this->validator->add_rule($v3 = array(LIMB_DIR . '/src/validators/rules/required_rule', 'restriction'));

Modified: 2.x/trunk/src/actions/site_structure/node_select_action.class.php
===================================================================
--- 2.x/trunk/src/actions/site_structure/node_select_action.class.php	2007-06-08 11:40:34 UTC (rev 5972)
+++ 2.x/trunk/src/actions/site_structure/node_select_action.class.php	2007-06-08 11:47:59 UTC (rev 5973)
@@ -33,7 +33,7 @@
     $response->set_content_type('text/xml');
     usort($objects_data, array($this, '_sort_by_title'));
 
-    $xml .= '<nodes>';
+    $xml = '<nodes>';
     $_nodes_xml = $this->_make_xml($objects_data);
     $xml .= $this->_replace_special_chars($_nodes_xml);
     $xml .= '</nodes>';

Modified: 2.x/trunk/src/image/image_gd.class.php
===================================================================
--- 2.x/trunk/src/image/image_gd.class.php	2007-06-08 11:40:34 UTC (rev 5972)
+++ 2.x/trunk/src/image/image_gd.class.php	2007-06-08 11:47:59 UTC (rev 5973)
@@ -251,7 +251,10 @@
       }
     }
 
-    return $background_color;
+    if(isset($background_color))
+      return $background_color;
+
+    return $bg_color;
   }
 }
 ?>

Modified: 2.x/trunk/src/stats/stats_routes_report.class.php
===================================================================
--- 2.x/trunk/src/stats/stats_routes_report.class.php	2007-06-08 11:40:34 UTC (rev 5972)
+++ 2.x/trunk/src/stats/stats_routes_report.class.php	2007-06-08 11:47:59 UTC (rev 5973)
@@ -97,7 +97,7 @@
       if($prev_session_id != $session_id)
       {
         $counter = 0;
-        $session_rotes[$session_id] = '';
+        $session_routes[$session_id] = '';
         $prev_record = array('uri' => '', 'action' => '');
       }
 
@@ -110,12 +110,12 @@
       {
         $session_events[$session_id][] = $record;
         $prev_record = $record;
-        $session_rotes[$session_id] .= '=>'. $record['uri'] .'***'. $record['action'];
+        $session_routes[$session_id] .= '=>'. $record['uri'] .'***'. $record['action'];
         $counter++;
       }
     }
 
-    $unique_routes = array_count_values($session_rotes);
+    $unique_routes = array_count_values($session_routes);
     arsort($unique_routes);
 
     $total_routes = array_sum($unique_routes);