Merge pull request #1304 from ovruni/master

kamaulynder · kamaulynder · commit d90dbcfe3bbe · 2014-02-11T11:15:40.000+03:00
Feed Category
diff --git a/application/controllers/admin/reports.php b/application/controllers/admin/reports.php
@@ -548,11 +548,11 @@ public function edit($id = FALSE, $saved = FALSE)
 					$form['location_name'] = $feed_item->location->location_name;
 				}
 				// HT: new code
-				$feed_categories = ORM::factory('feed_category')->where('feed_item_id', $feed_item->id)->select_list('id', 'category_id');
-				if ($feed_categories)
+				$feed_item_categories = ORM::factory('feed_item_category')->where('feed_item_id', $feed_item->id)->select_list('id', 'category_id');
+				if ($feed_item_categories)
 				{
-					foreach($feed_categories as $feed_category) {
-						$form['incident_category'][] = $feed_category;
+					foreach($feed_item_categories as $feed_item_category) {
+						$form['incident_category'][] = $feed_item_category;
 					}
 				}
 				// HT: end of new code
diff --git a/application/controllers/scheduler/s_alerts.php b/application/controllers/scheduler/s_alerts.php
@@ -95,7 +95,9 @@ public function index()
 			$incident_query .= "AND DATE(i.incident_date) >= DATE_SUB( CURDATE(), INTERVAL ".($alert_days-1)." DAY )";
 		}
 		// End of New Code		
-
+		
+		$incidents = $db->query($incident_query);
+		
 		foreach ($incidents as $incident)
 		{
 			// ** Pre-Formatting Message ** //
@@ -282,7 +284,7 @@ private function _check_categories(Alert_Model $alertee, array $category_ids) {
 	 * @return boolean
 	 */
 	private function _multi_subscribe(Alert_Model $alertee, $incident_id) {
-		$multi_subscribe_ids = ORM::factory('alert')->where('alert_confirmed','1')->where('alert_recipient', $alertee->recipient)->select_list('id', 'id');
+		$multi_subscribe_ids = ORM::factory('alert')->where('alert_confirmed','1')->where('alert_recipient', $alertee->alert_recipient)->select_list('id', 'id');
 		$subscription_alert = ORM::factory('alert_sent')->where('incident_id', $incident_id)->in('alert_id', $multi_subscribe_ids)->find();
 		return ((boolean) $subscription_alert->id);
 	}
diff --git a/application/controllers/scheduler/s_feeds.php b/application/controllers/scheduler/s_feeds.php
@@ -99,25 +99,27 @@ public function index()
 						if(!empty($categories)) {
 							foreach($categories as $category) {
 								$categoryData = ORM::factory('category')->where('category_title', $category->term)->find();
-								if($categoryData) {
-									$category_ids->feed_category[$categoryData->id] = $categoryData->id;
+								if($categoryData->loaded == TRUE) {
+									$category_ids->feed_item_category[$categoryData->id] = $categoryData->id;
 								} else {
 									$newcategory = new Category_Model();
 									$newcategory->category_title = $category->term;
 									$newcategory->parent_id = 0;
 									$newcategory->category_description = $category->term;
 									$newcategory->category_color = '000000';
+									$newcategory->category_visible = 0;
 									$newcategory->save();
-									$category_ids->feed_category[$newcategory->id] = $newcategory->id;
+									$category_ids->feed_item_category[$newcategory->id] = $newcategory->id;
 								}
+
 							}
 						}
 						// HT: End of new code
 						
 						$newitem->save();
 
 						// HT: New code
-						if(!empty($category_ids->feed_category)) {
+						if(!empty($category_ids->feed_item_category)) {
 							feed::save_category($category_ids, $newitem);
 						}
 						// HT: End of New code
diff --git a/application/controllers/scheduler/s_twitter.php b/application/controllers/scheduler/s_twitter.php
@@ -95,7 +95,7 @@ private function add_hash_tweets($data)
 		$service = $services->where('service_name', 'Twitter')->find();
 
 		$tweet_results = json_decode($data);
-		foreach($tweet_results ->statuses as $tweet)
+		foreach($tweet_results->statuses as $tweet)
 		{
 			$reporter = ORM::factory('reporter')
 				->where('service_id', $service->id)
diff --git a/application/helpers/feed.php b/application/helpers/feed.php
@@ -53,15 +53,15 @@ public static function simplepie( $feed_url = NULL )
 	public static function save_category($post, $feed_item)
 	{
 		// Delete Previous Entries
-		ORM::factory('feed_category')->where('feed_item_id', $feed_item->id)->delete_all();
+		ORM::factory('feed_item_category')->where('feed_item_id', $feed_item->id)->delete_all();
 	
-		foreach ($post->feed_category as $item)
+		foreach ($post->feed_item_category as $item)
 		{
-			$feed_category = new Feed_Category_Model();
-			$feed_category->feed_item_id = $feed_item->id;
-			$feed_category->category_id = $item;
-			$feed_category->save();
+			$feed_item_category = new Feed_Item_Category_Model();
+			$feed_item_category->feed_item_id = $feed_item->id;
+			$feed_item_category->category_id = $item;
+			$feed_item_category->save();
 		}
 	}
 	
-}
+}
diff --git a/application/libraries/Geocoder.php b/application/libraries/Geocoder.php
@@ -56,7 +56,7 @@ function geocode_feed ($feed_url = NULL)
 
 			if ($geonames_status == "200")
 			{ // Successful
-				$request_url = $base_url . "&feedUrl=" . urlencode($feed_url);
+				$request_url = $base_url . "&feedUrl=" . urlencode($feed_url)."&username=ushahididev";
 			}
 			else
 			{ // Down perhaps?? Use direct feed
diff --git a/application/models/category.php b/application/models/category.php
@@ -18,7 +18,7 @@ class Category_Model extends ORM_Tree {
 	 * One-to-many relationship definition
 	 * @var array
 	 */
-	protected $has_many = array('incident' => 'incident_category', 'category_lang');
+	protected $has_many = array('incident' => 'incident_category', 'feed_item' => 'feed_item_category', 'category_lang');
 	
 	/**
 	 * Database table name
diff --git a/application/models/feed_item.php b/application/models/feed_item.php
@@ -13,7 +13,7 @@ class Feed_Item_Model extends ORM
 	
 	// HT: New code
 	protected $has_many = array(
-			'category' => 'feed_category',
+			'category' => 'feed_item_category',
 	);
 	// HT: End of new code
 	
diff --git a/application/models/feed_item_category.php b/application/models/feed_item_category.php
@@ -1,7 +1,7 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 // HT: New model
 /**
-* Model for Categories for each Feed
+* Model for Categories for each Feed Item
  *
  * PHP version 5
  * LICENSE: This source file is subject to LGPL license
@@ -14,15 +14,15 @@
  * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
  */
 
-class Feed_Category_Model extends ORM
+class Feed_Item_Category_Model extends ORM
 {
 	protected $belongs_to = array('feed_item', 'category');
 	
 	// Database table name
-	protected $table_name = 'feed_category';
+	protected $table_name = 'feed_item_category';
 	
 	/**
-	 * Assigns a category id to an feed if it hasn't already been assigned
+	 * Assigns a category id to an feed item if it hasn't already been assigned
 	 * @param int $feed_id feed to assign the category to
 	 * @param int $category_id category id of the category you want to assign to the feed
 	 * @return array
@@ -33,14 +33,14 @@ public static function assign_category_to_feed($feed_id,$category_id)
 		// Check to see if it is already added to that category
 		//    If it's not, add it.
 		
-		$feed_category = ORM::factory('feed_category')->where(array('feed_item_id'=>$feed_id,'category_id'=>$category_id))->find_all();
+		$feed_item_category = ORM::factory('feed_item_category')->where(array('feed_item_id'=>$feed_id,'category_id'=>$category_id))->find_all();
 		
-		if( ! $feed_category->count() )
+		if( ! $feed_item_category->count() )
 		{
-			$new_feed_category = ORM::factory('feed_category');
-			$new_feed_category->category_id = $category_id;
-			$new_feed_category->feed_item_id = $feed_id;
-			$new_feed_category->save();
+			$new_feed_item_category = ORM::factory('feed_item_category');
+			$new_feed_item_category->category_id = $category_id;
+			$new_feed_item_category->feed_item_id = $feed_id;
+			$new_feed_item_category->save();
 		}
 		
 		return true;

Original file line number	Diff line number	Diff line change
`@@ -548,11 +548,11 @@ public function edit($id = FALSE, $saved = FALSE)`
`548`	`548`	`$form['location_name'] = $feed_item->location->location_name;`
`549`	`549`	`}`
`550`	`550`	`// HT: new code`
`551`		`- $feed_categories = ORM::factory('feed_category')->where('feed_item_id', $feed_item->id)->select_list('id', 'category_id');`
`552`		`- if ($feed_categories)`
	`551`	`+ $feed_item_categories = ORM::factory('feed_item_category')->where('feed_item_id', $feed_item->id)->select_list('id', 'category_id');`
	`552`	`+ if ($feed_item_categories)`
`553`	`553`	`{`
`554`		`- foreach($feed_categories as $feed_category) {`
`555`		`- $form['incident_category'][] = $feed_category;`
	`554`	`+ foreach($feed_item_categories as $feed_item_category) {`
	`555`	`+ $form['incident_category'][] = $feed_item_category;`
`556`	`556`	`}`
`557`	`557`	`}`
`558`	`558`	`// HT: end of new code`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,9 @@ public function index()`
`95`	`95`	`$incident_query .= "AND DATE(i.incident_date) >= DATE_SUB( CURDATE(), INTERVAL ".($alert_days-1)." DAY )";`
`96`	`96`	`}`
`97`	`97`	`// End of New Code`
`98`		`-`
	`98`	`+`
	`99`	`+ $incidents = $db->query($incident_query);`
	`100`	`+`
`99`	`101`	`foreach ($incidents as $incident)`
`100`	`102`	`{`
`101`	`103`	`// Pre-Formatting Message //`
`@@ -282,7 +284,7 @@ private function _check_categories(Alert_Model $alertee, array $category_ids) {`
`282`	`284`	`* @return boolean`
`283`	`285`	`*/`
`284`	`286`	`private function _multi_subscribe(Alert_Model $alertee, $incident_id) {`
`285`		`- $multi_subscribe_ids = ORM::factory('alert')->where('alert_confirmed','1')->where('alert_recipient', $alertee->recipient)->select_list('id', 'id');`
	`287`	`+ $multi_subscribe_ids = ORM::factory('alert')->where('alert_confirmed','1')->where('alert_recipient', $alertee->alert_recipient)->select_list('id', 'id');`
`286`	`288`	`$subscription_alert = ORM::factory('alert_sent')->where('incident_id', $incident_id)->in('alert_id', $multi_subscribe_ids)->find();`
`287`	`289`	`return ((boolean) $subscription_alert->id);`
`288`	`290`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ private function add_hash_tweets($data)`
`95`	`95`	`$service = $services->where('service_name', 'Twitter')->find();`
`96`	`96`
`97`	`97`	`$tweet_results = json_decode($data);`
`98`		`- foreach($tweet_results ->statuses as $tweet)`
	`98`	`+ foreach($tweet_results->statuses as $tweet)`
`99`	`99`	`{`
`100`	`100`	`$reporter = ORM::factory('reporter')`
`101`	`101`	`->where('service_id', $service->id)`
Original file line number	Diff line number	Diff line change
`@@ -53,15 +53,15 @@ public static function simplepie( $feed_url = NULL )`
`53`	`53`	`public static function save_category($post, $feed_item)`
`54`	`54`	`{`
`55`	`55`	`// Delete Previous Entries`
`56`		`- ORM::factory('feed_category')->where('feed_item_id', $feed_item->id)->delete_all();`
	`56`	`+ ORM::factory('feed_item_category')->where('feed_item_id', $feed_item->id)->delete_all();`
`57`	`57`
`58`		`- foreach ($post->feed_category as $item)`
	`58`	`+ foreach ($post->feed_item_category as $item)`
`59`	`59`	`{`
`60`		`- $feed_category = new Feed_Category_Model();`
`61`		`- $feed_category->feed_item_id = $feed_item->id;`
`62`		`- $feed_category->category_id = $item;`
`63`		`- $feed_category->save();`
	`60`	`+ $feed_item_category = new Feed_Item_Category_Model();`
	`61`	`+ $feed_item_category->feed_item_id = $feed_item->id;`
	`62`	`+ $feed_item_category->category_id = $item;`
	`63`	`+ $feed_item_category->save();`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`-}`
	`67`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ function geocode_feed ($feed_url = NULL)`
`56`	`56`
`57`	`57`	`if ($geonames_status == "200")`
`58`	`58`	`{ // Successful`
`59`		`- $request_url = $base_url . "&feedUrl=" . urlencode($feed_url);`
	`59`	`+ $request_url = $base_url . "&feedUrl=" . urlencode($feed_url)."&username=ushahididev";`
`60`	`60`	`}`
`61`	`61`	`else`
`62`	`62`	`{ // Down perhaps?? Use direct feed`