Skip to content

Commit

Permalink
Commenting out "How to Help" options in admin settings. Fixing Twitte…
Browse files Browse the repository at this point in the history 
…r scheduler when user isn't set. Adding MHI verify_password rules to validation JS.
  • Loading branch information
@brianherbert
brianherbert committed Aug 14, 2010
1 parent 09909c1 commit 712d005
Show file tree
Hide file tree
Showing 4 changed files with 119 additions and 105 deletions.
8 changes: 4 additions & 4 deletions application/controllers/admin/settings.php
View file
Expand Up @@ -47,7 +47,7 @@ function site()
'site_email' => '',
'alerts_email' => '',
'site_language' => '',
'site_help_page' => '',
//'site_help_page' => '',
'site_contact_page' => '',
'items_per_page' => '',
'items_per_page_admin' => '',
Expand Down Expand Up @@ -89,7 +89,7 @@ function site()
$post->add_rules('site_email', 'email', 'length[4,100]');
$post->add_rules('alerts_email', 'email', 'length[4,100]');
$post->add_rules('site_language','required', 'length[5, 5]');
$post->add_rules('site_help_page','required','between[0,1]');
//$post->add_rules('site_help_page','required','between[0,1]');
$post->add_rules('site_contact_page','required','between[0,1]');
$post->add_rules('items_per_page','required','between[10,50]');
$post->add_rules('items_per_page_admin','required','between[10,50]');
Expand Down Expand Up @@ -118,7 +118,7 @@ function site()
$settings->site_email = $post->site_email;
$settings->alerts_email = $post->alerts_email;
$settings->site_language = $post->site_language;
$settings->site_help_page = $post->site_help_page;
//$settings->site_help_page = $post->site_help_page;
$settings->site_contact_page = $post->site_contact_page;
$settings->items_per_page = $post->items_per_page;
$settings->items_per_page_admin = $post->items_per_page_admin;
Expand Down Expand Up @@ -175,7 +175,7 @@ function site()
'site_email' => $settings->site_email,
'alerts_email' => $settings->alerts_email,
'site_language' => $settings->site_language,
'site_help_page' => $settings->site_help_page,
//'site_help_page' => $settings->site_help_page,
'site_contact_page' => $settings->site_contact_page,
'items_per_page' => $settings->items_per_page,
'items_per_page_admin' => $settings->items_per_page_admin,
Expand Down
194 changes: 99 additions & 95 deletions application/controllers/scheduler/s_twitter.php
View file
Expand Up @@ -14,10 +14,10 @@
*/

class S_Twitter_Controller extends Controller {

public function __construct()
{
parent::__construct();
{
parent::__construct();
}

public function index()
Expand Down Expand Up @@ -51,7 +51,7 @@ public function index()
{
$page = 1;
$have_results = TRUE; //just starting us off as true, although there may be no results
while($have_results == TRUE && $page <= 2){ //This loop is for pagination of rss results
while($have_results == TRUE AND $page <= 2){ //This loop is for pagination of rss results
$hashtag = trim(str_replace('#','',$hashtag));
$twitter_url = 'http://search.twitter.com/search.json?q=%23'.$hashtag.'&rpp=100&page='.$page;
$curl_handle = curl_init();
Expand All @@ -69,7 +69,7 @@ public function index()
//Perform Direct Reports Search
$username = $settings->twitter_username;
$password = $settings->twitter_password;
if (!empty($username) && !empty($password))
if (!empty($username) AND !empty($password))
{
$twitter_url = 'http://twitter.com/statuses/replies.json'; //XXX '?.$last_tweet_id;
$curl_handle = curl_init();
Expand All @@ -92,10 +92,10 @@ public function index()
private function add_reply_tweets($data)
{
$services = new Service_Model();
$service = $services->where('service_name', 'Twitter')->find();
$service = $services->where('service_name', 'Twitter')->find();
if (!$service) {
return;
}
return;
}
$tweets = json_decode($data, false);
if (!$tweets) {
return;
Expand All @@ -105,64 +105,68 @@ private function add_reply_tweets($data)
}

foreach($tweets as $tweet) {
$tweet_user = $tweet->{'user'};

$reporter = ORM::factory('reporter')
->where('service_id', $service->id)
->where('service_userid', $tweet_user->{'id'})
->find();

if (!$reporter->loaded)
if (isset($tweet->{'user'}))
{
// Add new reporter
$names = explode(' ', $tweet_user->{'name'}, 2);
$last_name = '';
if (count($names) == 2) {
$last_name = $names[1];
}
$tweet_user = $tweet->{'user'};

// get default reporter level (Untrusted)
$level = ORM::factory('level')
->where('level_weight', 0)
$reporter = ORM::factory('reporter')
->where('service_id', $service->id)
->where('service_userid', $tweet_user->{'id'})
->find();

$reporter = new Reporter_Model();
$reporter->service_id = $service->id;
$reporter->level_id = $level->id;
$reporter->service_userid = $tweet_user->{'id'};
$reporter->service_account = $tweet_user->{'screen_name'};
$reporter->reporter_first = $names[0];
$reporter->reporter_last = $last_name;
$reporter->reporter_email = null;
$reporter->reporter_phone = null;
$reporter->reporter_ip = null;
$reporter->reporter_date = date('Y-m-d');
$reporter->save();
$reporter_id = $reporter->id;
if ( ! $reporter->loaded)
{
// Add new reporter
$names = explode(' ', $tweet_user->{'name'}, 2);
$last_name = '';
if (count($names) == 2) {
$last_name = $names[1];
}

// get default reporter level (Untrusted)
$level = ORM::factory('level')
->where('level_weight', 0)
->find();

$reporter = new Reporter_Model();
$reporter->service_id = $service->id;
$reporter->level_id = $level->id;
$reporter->service_userid = $tweet_user->{'id'};
$reporter->service_account = $tweet_user->{'screen_name'};
$reporter->reporter_first = $names[0];
$reporter->reporter_last = $last_name;
$reporter->reporter_email = null;
$reporter->reporter_phone = null;
$reporter->reporter_ip = null;
$reporter->reporter_date = date('Y-m-d');
$reporter->save();
$reporter_id = $reporter->id;
}

if ($reporter->level_id > 1 &&
count(ORM::factory('message')->where('service_messageid', $tweet->{'id'})
->find_all()) == 0) {
// Save Tweet as Message
$message = new Message_Model();
$message->parent_id = 0;
$message->incident_id = 0;
$message->user_id = 0;
$message->reporter_id = $reporter->id;
$message->message_from = $tweet_user->{'screen_name'};
$message->message_to = null;
$message->message = $tweet->{'text'};
$message->message_type = 1; // Inbox
$tweet_date = date("Y-m-d H:i:s",strtotime($tweet->{'created_at'}));
$message->message_date = $tweet_date;
$message->service_messageid = $tweet->{'id'};
$message->save();
}
}

if ($reporter->level_id > 1 &&
count(ORM::factory('message')->where('service_messageid', $tweet->{'id'})
->find_all()) == 0) {
// Save Tweet as Message
$message = new Message_Model();
$message->parent_id = 0;
$message->incident_id = 0;
$message->user_id = 0;
$message->reporter_id = $reporter->id;
$message->message_from = $tweet_user->{'screen_name'};
$message->message_to = null;
$message->message = $tweet->{'text'};
$message->message_type = 1; // Inbox
$tweet_date = date("Y-m-d H:i:s",strtotime($tweet->{'created_at'}));
$message->message_date = $tweet_date;
$message->service_messageid = $tweet->{'id'};
$message->save();
}
}
}
}


/**
* Adds hash tweets in JSON format to the database and saves the sender as a new
* Reporter if they don't already exist
Expand All @@ -171,64 +175,64 @@ private function add_reply_tweets($data)
private function add_hash_tweets($data)
{
$services = new Service_Model();
$service = $services->where('service_name', 'Twitter')->find();
$service = $services->where('service_name', 'Twitter')->find();
if (!$service) {
return;
}
return;
}
$tweets = json_decode($data, false);
if (!$tweets) {
return;
}
if (isset($tweets->{'error'})) {
return;
}

$tweet_results = $tweets->{'results'};

foreach($tweet_results as $tweet) {
$reporter = ORM::factory('reporter')
$reporter = ORM::factory('reporter')
->where('service_id', $service->id)
->where('service_account', $tweet->{'from_user'})
->find();

if (!$reporter->loaded)
{
// get default reporter level (Untrusted)
$level = ORM::factory('level')
$level = ORM::factory('level')
->where('level_weight', 0)
->find();

$reporter->service_id = $service->id;
$reporter->level_id = $level->id;
$reporter->service_userid = null;
$reporter->service_account = $tweet->{'from_user'};
$reporter->reporter_first = null;
$reporter->reporter_last = null;
$reporter->reporter_email = null;
$reporter->reporter_phone = null;
$reporter->reporter_ip = null;
$reporter->reporter_date = date('Y-m-d');
$reporter->save();
$reporter->service_id = $service->id;
$reporter->level_id = $level->id;
$reporter->service_userid = null;
$reporter->service_account = $tweet->{'from_user'};
$reporter->reporter_first = null;
$reporter->reporter_last = null;
$reporter->reporter_email = null;
$reporter->reporter_phone = null;
$reporter->reporter_ip = null;
$reporter->reporter_date = date('Y-m-d');
$reporter->save();
}
if ($reporter->level_id > 1 &&
count(ORM::factory('message')->where('service_messageid', $tweet->{'id'})
->find_all()) == 0) {

if ($reporter->level_id > 1 &&
count(ORM::factory('message')->where('service_messageid', $tweet->{'id'})
->find_all()) == 0) {
// Save Tweet as Message
$message = new Message_Model();
$message->parent_id = 0;
$message->incident_id = 0;
$message->user_id = 0;
$message->reporter_id = $reporter->id;
$message->message_from = $tweet->{'from_user'};
$message->message_to = null;
$message->message = $tweet->{'text'};
$message->message_type = 1; // Inbox
$tweet_date = date("Y-m-d H:i:s",strtotime($tweet->{'created_at'}));
$message->message_date = $tweet_date;
$message->service_messageid = $tweet->{'id'};
$message->save();
}
}
$message = new Message_Model();
$message->parent_id = 0;
$message->incident_id = 0;
$message->user_id = 0;
$message->reporter_id = $reporter->id;
$message->message_from = $tweet->{'from_user'};
$message->message_to = null;
$message->message = $tweet->{'text'};
$message->message_type = 1; // Inbox
$tweet_date = date("Y-m-d H:i:s",strtotime($tweet->{'created_at'}));
$message->message_date = $tweet_date;
$message->service_messageid = $tweet->{'id'};
$message->save();
}
}
}
}
4 changes: 3 additions & 1 deletion application/views/admin/site.php
View file
Expand Up @@ -81,10 +81,12 @@
<h4><a href="#" class="tooltip" title="<?php echo Kohana::lang("tooltips.settings_display_contact"); ?>"><?php echo Kohana::lang('settings.site.display_contact_page');?></a></h4>
<?php print form::dropdown('site_contact_page', $yesno_array, $form['site_contact_page']); ?>
</div>
<!--
<div class="row">
<h4><a href="#" class="tooltip" title="<?php echo Kohana::lang("tooltips.settings_display_howtohelp"); ?>"><?php echo Kohana::lang('settings.site.display_howtohelp_page');?></a></h4>
<?php print form::dropdown('site_help_page', $yesno_array, $form['site_help_page']); ?>
<?php /* print form::dropdown('site_help_page', $yesno_array, $form['site_help_page']); */ ?>
</div>
-->
<div class="row">
<h4><a href="#" class="tooltip" title="<?php echo Kohana::lang("tooltips.settings_display_items_per_page"); ?>"><?php echo Kohana::lang('settings.site.items_per_page');?></a></h4>
<span class="sel-holder">
Expand Down
18 changes: 13 additions & 5 deletions application/views/mhi/mhi_signup_js.php
View file
Expand Up @@ -58,6 +58,10 @@
},
signup_tos: {
required: true
},
verify_password: {
required: true,
rangelength: [4, 32]
}
},
messages: {
Expand All @@ -76,22 +80,26 @@
equalTo: "Passwords do not match."
},
signup_subdomain: {
required: "Please enter your instance address.",
rangelength: "The name you use for your instance address must be between 4 and 32 characters."
required: "Please enter your deployment address.",
rangelength: "The name you use for your deployment address must be between 4 and 32 characters."
},
signup_instance_name: {
required: "Please enter a name for your instance.",
required: "Please enter a name for your deployment.",
rangelength: "Name must be between 4 and 100 characters."
},
signup_instance_tagline: {
required: "Please enter a tagline for your instance.",
required: "Please enter a tagline for your deployment.",
rangelength: "Tagline must be between 4 and 100 characters."
},
signup_report_categories: {
required: "Please enter at least one category for your instance."
required: "Please enter at least one category for your deployment."
},
signup_tos: {
required: "You must accept the Website Terms of Use."
},
signup_password: {
required: "Please enter your password.",
rangelength: "Your password is between 4 and 32 characters."
}

},
Expand Down

0 comments on commit 712d005

Please sign in to comment.