diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php index 62c35d611..180588451 100644 --- a/e107_admin/prefs.php +++ b/e107_admin/prefs.php @@ -727,39 +727,11 @@ $text .= " $text .= " - - - - - ".$frm->select_open('time_offset', 'class=tbox select time-offset');//use form handler because of the tabindex -$toffset = array("-12", "-11", "-10", "-9", "-8", "-7", "-6", "-5", "-4", "-3", "-2", "-1", "0", "+1", "+2", "+3", "+4", "+5", "+6", "+7", "+8", "+9", "+10", "+11", "+12", "+13", "+14", "+15", "+16"); -if(! isset($pref['time_offset'])) -{ - $pref['time_offset'] = "0"; -} - - -//XXX TODO FIXME - Do we still need this? - -foreach($toffset as $o) -{ - $text .= " - ".$frm->option($o, $o, ($o == $pref['time_offset']))." - "; -} - - - - $timeZones = systemTimeZones(); - - + "; +$timeZones = systemTimeZones(); $text .= " - -
".PRFLAN_27."
- - diff --git a/e107_core/xml/default_install.xml b/e107_core/xml/default_install.xml index cd1f717f1..18fd42cdf 100644 --- a/e107_core/xml/default_install.xml +++ b/e107_core/xml/default_install.xml @@ -310,7 +310,6 @@ City, State, Country style.css 75 - 0 UTC 1 1 diff --git a/e107_plugins/rss_menu/rss.php b/e107_plugins/rss_menu/rss.php index 3175f1881..42c345369 100644 --- a/e107_plugins/rss_menu/rss.php +++ b/e107_plugins/rss_menu/rss.php @@ -199,7 +199,6 @@ class rssCreate $sql_rs = new db; global $rssgen; $sql = e107::getDb(); - $pref = e107::getPref(); $tp = e107::getParser(); $this->e107 = e107::getInstance(); @@ -207,7 +206,6 @@ class rssCreate $this -> path = e_PLUGIN."rss_menu/"; $this -> rssType = $rss_type; $this -> topicid = $topic_id; - $this -> offset = $pref['time_offset'] * 3600; $this -> limit = $row['rss_limit']; $this -> contentType = $row['rss_name']; @@ -422,7 +420,7 @@ class rssCreate ".$tp->toRss($rss_title)." ".$pref['siteurl']." ".$tp->toRss($pref['sitedescription'])." - ".$itemdate = date("r", ($time + $this -> offset))." + ".$itemdate = date("r", ($time))." http://backend.userland.com/rss092\n"; foreach($this -> rssItems as $value) @@ -473,8 +471,8 @@ class rssCreate ".$tp->toRss(SITEDISCLAIMER)." ".$this->nospam($pref['siteadminemail'])." (".$pref['siteadmin'].") ".$this->nospam($pref['siteadminemail'])." (".$pref['siteadmin'].") - ".date("r",($time + $this -> offset))." - ".date("r",($time + $this -> offset))." + ".date("r",($time))." + ".date("r",($time))." http://backend.userland.com/rss e107 (http://e107.org) hourly @@ -549,7 +547,7 @@ class rssCreate echo "\n"; } - echo "".date("r", ($value['pubdate'] + $this -> offset))."\n"; + echo "".date("r", ($value['pubdate']))."\n"; if($link) { @@ -596,7 +594,7 @@ class rssCreate ".$pref['siteurl']." ".$tp->toRss($pref['sitedescription'])." ".CORE_LC.(defined("CORE_LC2") ? "-".CORE_LC2 : "")." - ".$this->get_iso_8601_date($time + $this -> offset). " + ".$this->get_iso_8601_date($time). " ".$this->nospam($pref['siteadminemail'])." nospam($pref['siteadminemail'])."\" /> @@ -629,7 +627,7 @@ class rssCreate ".$tp->toRss($value['title'])." ".$link." - ".$this->get_iso_8601_date($time + $this -> offset)." + ".$this->get_iso_8601_date($time)." ".$value['author']." ".$tp->toRss($value['category_name'])." ".$tp->toRss($value['description']). " @@ -653,7 +651,7 @@ class rssCreate echo " ".$pref['siteurl']."\n ".$tp->toRss($rss_title)."\n - ".$this->get_iso_8601_date($time + $this -> offset)."\n"; + ".$this->get_iso_8601_date($time)."\n"; // Recommended echo " @@ -689,7 +687,7 @@ class rssCreate echo " ".$value['link']."\n ".$tp->toRss($value['title'])."\n - ".$this->get_iso_8601_date($value['pubdate'] + $this -> offset)."\n"; + ".$this->get_iso_8601_date($value['pubdate'])."\n"; // Recommended $author = ($value['author']) ? $value['author'] : "unknown"; @@ -713,7 +711,7 @@ class rssCreate // // Jane Doe // - echo "".$this->get_iso_8601_date($value['pubdate'] + $this -> offset)."\n"; + echo "".$this->get_iso_8601_date($value['pubdate'])."\n"; // // http://example.org/ // Fourty-Two