Skip to content
This repository has been archived by the owner on Dec 6, 2019. It is now read-only.

Commit

Permalink
dashboard news fix (x2 =\)
Browse files Browse the repository at this point in the history
  • Loading branch information
Nabeel Shahzad committed Apr 13, 2011
1 parent cb0122a commit 297bbfa
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 34 deletions.
45 changes: 25 additions & 20 deletions admin/modules/Dashboard/Dashboard.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ public function CheckForUpdates() {

if ($feed === false) {

$url = Config::Get('PHPVMS_API_SERVER') . '/version/get/xml/' . PHPVMS_VERSION;
$url = Config::Get('PHPVMS_API_SERVER') . '/version/get/json/';

# Default to fopen(), if that fails it'll use CURL
$file = new CodonWebService();
$contents = @$file->get($url);

# Something should have been returned
if ($contents == '') {
$msg = '<br /><b>Error:</b> The phpVMS update server could not be contacted.
Expand All @@ -98,9 +98,10 @@ public function CheckForUpdates() {
return;
}

$xml = @simplexml_load_string($contents);
#$xml = @simplexml_load_string($contents);
$message = json_decode($contents);

if (!$xml) {
if (!$message) {
$msg = '<br /><b>Error:</b> There was an error retrieving news. It may be temporary.
Check to make sure allow_url_fopen is set to ON in your php.ini, or
that the cURL module is installed (contact your host).';
Expand All @@ -109,13 +110,13 @@ public function CheckForUpdates() {
return;
}

CodonCache::write($key, $xml, 'medium_well');
CodonCache::write($key, $message, 'medium_well');
}

$version = $xml->version;
$version = $message->version;

if (Config::Get('CHECK_BETA_VERSION') == true) {
$version = $xml->betaversion;
$version = $message->betaversion;
}

$postversion = intval(str_replace('.', '', trim($version)));
Expand All @@ -128,30 +129,34 @@ public function CheckForUpdates() {
$this->set('message', 'Version ' . $version . ' is available for download! Please update ASAP');
}

$this->set('updateinfo', Template::GetTemplate('core_error.tpl', true));
$this->set('updateinfo', Template::GetTemplate('core_error.tpl', true));
}

/* Retrieve latest news from Feedburner RSS, in case the phpVMS site is down
*/
$key = 'PHPVMS_NEWS_FEED';
$contents = CodonCache::read($key);
if ($contents === false) {
$contents = $file->get(Config::Get('PHPVMS_NEWS_FEED'));
CodonCache::write($key, $contents, 'medium_well');
$feed_contents = CodonCache::read($key);
if ($feed_contents === false) {
$feed_contents = $file->get(Config::Get('PHPVMS_NEWS_FEED'));
CodonCache::write($key, $feed_contents, 'medium_well');
}

$i = 1;
$count = 5; // Show the last 5
$feed = simplexml_load_string($contents);
$count = 5;
$contents = '';
$feed = simplexml_load_string($feed_contents);
foreach ($feed->channel->item as $news) {

$news_content = (string) $news->description;
$guid = (string) $news->guid;
$title = (string) $news->title;
$date_posted = str_replace('-0400', '', (string) $news->pubDate);

$contents .= "<div class=\"newsitem\">
<b>{$news->title}</b> <br />{$news_content}
<br /><br />
Posted: {$date_posted}
</div>";
$contents .= "<div class=\"newsitem\">";
$contents .= '<a href="'.$guid.'"><b>'.$title.'</b></a><br />';
$contents .= $news_content;
$contents .= '<br /><br />Posted: '.$date_posted;
$contents .= '</div>';

if ($i++ == $count)
break;
Expand Down
2 changes: 1 addition & 1 deletion core/version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2.1.934-99-g7235e74
v2.1.934-100-gcb0122a
2 changes: 1 addition & 1 deletion install/hashlist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ fb4ca464f4e518e63c31b409e48588bf *./admin/modules/SiteCMS/SiteCMS.php
086a4da89e7f2c4f6dba1284cc3ddc3a *./admin/modules/Settings/Settings.php
c32304847debef3cbef412e8102e7566 *./admin/modules/TemplateDiffs/TemplateDiffs.php
b912b3305bb2e94554ce6ec162610d9c *./admin/modules/Maintenance/Maintenance.php
95d84e5c88e0c851d88c79c5aeddb3da *./admin/modules/Dashboard/Dashboard.php
7d9dd19aa8516b4a88dce314242f826e *./admin/modules/Dashboard/Dashboard.php
5f88707e6c5e6faf726c292ee6e2a92f *./admin/modules/PIREPAdmin/PIREPAdmin.php
d41d8cd98f00b204e9800998ecf8427e *./lib/avatars/index.php
d41d8cd98f00b204e9800998ecf8427e *./lib/signatures/index.php
Expand Down
24 changes: 12 additions & 12 deletions install/sql/structure.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
<key Table="phpvms_groupmembers" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="2" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_groupmembers" Non_unique="1" Key_name="phpvms_groupmembers_ibfk_1" Seq_in_index="1" Column_name="groupid" Collation="A" Cardinality="2" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_groupmembers" Non_unique="1" Key_name="phpvms_groupmembers_ibfk_2" Seq_in_index="1" Column_name="pilotid" Collation="A" Cardinality="2" Null="" Index_type="BTREE" Comment="" />
<options Name="phpvms_groupmembers" Engine="InnoDB" Version="10" Row_format="Compact" Rows="2" Avg_row_length="8192" Data_length="16384" Max_data_length="0" Index_length="32768" Data_free="11534336" Auto_increment="180" Create_time="2011-03-23 18:46:35" Collation="latin1_swedish_ci" Create_options="" Comment="" />
<options Name="phpvms_groupmembers" Engine="InnoDB" Version="10" Row_format="Compact" Rows="2" Avg_row_length="8192" Data_length="16384" Max_data_length="0" Index_length="32768" Data_free="11534336" Auto_increment="181" Create_time="2011-03-23 18:46:35" Collation="latin1_swedish_ci" Create_options="" Comment="" />
</table_structure>
<table_structure name="phpvms_groups">
<field Field="groupid" Type="int(11)" Null="NO" Key="PRI" Extra="auto_increment" />
Expand Down Expand Up @@ -283,17 +283,17 @@
<key Table="phpvms_pilots" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="pilotid" Collation="A" Cardinality="1" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_pilots" Non_unique="1" Key_name="code" Seq_in_index="1" Column_name="code" Collation="A" Cardinality="1" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_pilots" Non_unique="1" Key_name="rank" Seq_in_index="1" Column_name="rank" Collation="A" Cardinality="1" Null="" Index_type="BTREE" Comment="" />
<options Name="phpvms_pilots" Engine="InnoDB" Version="10" Row_format="Compact" Rows="1" Avg_row_length="16384" Data_length="16384" Max_data_length="0" Index_length="32768" Data_free="11534336" Auto_increment="203" Create_time="2011-03-23 18:46:35" Collation="latin1_swedish_ci" Create_options="" Comment="" />
<options Name="phpvms_pilots" Engine="InnoDB" Version="10" Row_format="Compact" Rows="1" Avg_row_length="16384" Data_length="16384" Max_data_length="0" Index_length="32768" Data_free="11534336" Auto_increment="204" Create_time="2011-03-23 18:46:35" Collation="latin1_swedish_ci" Create_options="" Comment="" />
</table_structure>
<table_structure name="phpvms_pirepcomments">
<field Field="id" Type="int(11)" Null="NO" Key="PRI" Extra="auto_increment" />
<field Field="pirepid" Type="int(11)" Null="NO" Key="MUL" Extra="" />
<field Field="pilotid" Type="int(11)" Null="NO" Key="" Extra="" />
<field Field="comment" Type="text" Null="NO" Key="" Extra="" />
<field Field="postdate" Type="datetime" Null="NO" Key="" Extra="" />
<key Table="phpvms_pirepcomments" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="100" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_pirepcomments" Non_unique="1" Key_name="phpvms_pirepcomments_ibfk_1" Seq_in_index="1" Column_name="pirepid" Collation="A" Cardinality="100" Null="" Index_type="BTREE" Comment="" />
<options Name="phpvms_pirepcomments" Engine="InnoDB" Version="10" Row_format="Compact" Rows="100" Avg_row_length="163" Data_length="16384" Max_data_length="0" Index_length="16384" Data_free="11534336" Auto_increment="360" Create_time="2011-03-23 18:46:35" Collation="latin1_swedish_ci" Create_options="" Comment="" />
<key Table="phpvms_pirepcomments" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="103" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_pirepcomments" Non_unique="1" Key_name="phpvms_pirepcomments_ibfk_1" Seq_in_index="1" Column_name="pirepid" Collation="A" Cardinality="103" Null="" Index_type="BTREE" Comment="" />
<options Name="phpvms_pirepcomments" Engine="InnoDB" Version="10" Row_format="Compact" Rows="103" Avg_row_length="159" Data_length="16384" Max_data_length="0" Index_length="16384" Data_free="11534336" Auto_increment="363" Create_time="2011-03-23 18:46:35" Collation="latin1_swedish_ci" Create_options="" Comment="" />
</table_structure>
<table_structure name="phpvms_pirepfields">
<field Field="fieldid" Type="int(11)" Null="NO" Key="PRI" Extra="auto_increment" />
Expand Down Expand Up @@ -338,8 +338,8 @@
<field Field="source" Type="varchar(25)" Null="NO" Key="" Extra="" />
<field Field="exported" Type="tinyint(4)" Null="NO" Key="" Extra="" />
<field Field="rawdata" Type="text" Null="NO" Key="" Extra="" />
<key Table="phpvms_pireps" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="pirepid" Collation="A" Cardinality="106" Null="" Index_type="BTREE" Comment="" />
<options Name="phpvms_pireps" Engine="InnoDB" Version="10" Row_format="Compact" Rows="106" Avg_row_length="3400" Data_length="360448" Max_data_length="0" Index_length="0" Data_free="11534336" Auto_increment="313" Create_time="2011-04-12 19:05:07" Collation="latin1_swedish_ci" Create_options="" Comment="" />
<key Table="phpvms_pireps" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="pirepid" Collation="A" Cardinality="100" Null="" Index_type="BTREE" Comment="" />
<options Name="phpvms_pireps" Engine="InnoDB" Version="10" Row_format="Compact" Rows="100" Avg_row_length="3768" Data_length="376832" Max_data_length="0" Index_length="0" Data_free="11534336" Auto_increment="316" Create_time="2011-04-12 19:05:07" Collation="latin1_swedish_ci" Create_options="" Comment="" />
</table_structure>
<table_structure name="phpvms_pirepvalues">
<field Field="id" Type="int(11)" Null="NO" Key="PRI" Extra="auto_increment" />
Expand Down Expand Up @@ -385,21 +385,21 @@
<field Field="notes" Type="text" Null="NO" Key="" Extra="" />
<field Field="enabled" Type="int(11)" Null="NO" Key="" Default="1" Extra="" />
<field Field="bidid" Type="int(11)" Null="NO" Key="" Default="0" Extra="" />
<key Table="phpvms_schedules" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="147" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_schedules" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="161" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_schedules" Non_unique="1" Key_name="depicao" Seq_in_index="1" Column_name="depicao" Collation="A" Cardinality="2" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_schedules" Non_unique="1" Key_name="flightnum" Seq_in_index="1" Column_name="flightnum" Collation="A" Cardinality="4" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_schedules" Non_unique="1" Key_name="depicao_arricao" Seq_in_index="1" Column_name="depicao" Collation="A" Cardinality="2" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_schedules" Non_unique="1" Key_name="depicao_arricao" Seq_in_index="2" Column_name="arricao" Collation="A" Cardinality="2" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_schedules" Non_unique="1" Key_name="code" Seq_in_index="1" Column_name="code" Collation="A" Cardinality="2" Null="" Index_type="BTREE" Comment="" />
<options Name="phpvms_schedules" Engine="InnoDB" Version="10" Row_format="Compact" Rows="157" Avg_row_length="10122" Data_length="1589248" Max_data_length="0" Index_length="65536" Data_free="11534336" Auto_increment="154" Create_time="2011-03-23 18:46:35" Collation="latin1_swedish_ci" Create_options="" Comment="" />
<options Name="phpvms_schedules" Engine="InnoDB" Version="10" Row_format="Compact" Rows="152" Avg_row_length="10455" Data_length="1589248" Max_data_length="0" Index_length="65536" Data_free="11534336" Auto_increment="155" Create_time="2011-03-23 18:46:35" Collation="latin1_swedish_ci" Create_options="" Comment="" />
</table_structure>
<table_structure name="phpvms_sessions">
<field Field="id" Type="int(11)" Null="NO" Key="PRI" Extra="auto_increment" />
<field Field="pilotid" Type="int(11)" Null="NO" Key="" Extra="" />
<field Field="ipaddress" Type="varchar(25)" Null="NO" Key="" Extra="" />
<field Field="logintime" Type="datetime" Null="NO" Key="" Extra="" />
<key Table="phpvms_sessions" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="3" Null="" Index_type="BTREE" Comment="" />
<options Name="phpvms_sessions" Engine="MyISAM" Version="10" Row_format="Dynamic" Rows="3" Avg_row_length="38" Data_length="616" Max_data_length="281474976710655" Index_length="2048" Data_free="500" Auto_increment="328" Create_time="2011-03-23 18:46:35" Update_time="2011-04-13 16:48:52" Collation="latin1_swedish_ci" Create_options="" Comment="" />
<options Name="phpvms_sessions" Engine="MyISAM" Version="10" Row_format="Dynamic" Rows="3" Avg_row_length="38" Data_length="616" Max_data_length="281474976710655" Index_length="2048" Data_free="500" Auto_increment="331" Create_time="2011-03-23 18:46:35" Update_time="2011-04-13 19:06:11" Collation="latin1_swedish_ci" Create_options="" Comment="" />
</table_structure>
<table_structure name="phpvms_settings">
<field Field="id" Type="int(11)" Null="NO" Key="PRI" Extra="auto_increment" />
Expand All @@ -416,9 +416,9 @@
<field Field="id" Type="int(11)" Null="NO" Key="PRI" Extra="auto_increment" />
<field Field="name" Type="varchar(25)" Null="NO" Key="MUL" Extra="" />
<field Field="lastupdate" Type="datetime" Null="NO" Key="" Extra="" />
<key Table="phpvms_updates" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="7" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_updates" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="8" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_updates" Non_unique="1" Key_name="name" Seq_in_index="1" Column_name="name" Collation="A" Null="" Index_type="BTREE" Comment="" />
<options Name="phpvms_updates" Engine="MyISAM" Version="10" Row_format="Dynamic" Rows="7" Avg_row_length="33" Data_length="236" Max_data_length="281474976710655" Index_length="3072" Data_free="0" Auto_increment="8" Create_time="2011-04-12 23:52:07" Update_time="2011-04-13 16:47:58" Collation="latin1_swedish_ci" Create_options="" Comment="" />
<options Name="phpvms_updates" Engine="MyISAM" Version="10" Row_format="Dynamic" Rows="8" Avg_row_length="33" Data_length="268" Max_data_length="281474976710655" Index_length="3072" Data_free="0" Auto_increment="9" Create_time="2011-04-12 23:52:07" Update_time="2011-04-13 18:59:49" Collation="latin1_swedish_ci" Create_options="" Comment="" />
</table_structure>
</database>
</mysqldump>

0 comments on commit 297bbfa

Please sign in to comment.