From 4d3cb760deead35d070b2277e5e564623de7fa23 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Fri, 5 Jun 2009 01:14:09 -0600 Subject: Move watch notification menu from the view menu to under the Options menu. --- modules/notification/helpers/notification_menu.php | 16 +++++++++------- themes/default/images/ico-notify-add.png | Bin 1469 -> 0 bytes themes/default/images/ico-notify-remove.png | Bin 1500 -> 0 bytes 3 files changed, 9 insertions(+), 7 deletions(-) delete mode 100644 themes/default/images/ico-notify-add.png delete mode 100644 themes/default/images/ico-notify-remove.png diff --git a/modules/notification/helpers/notification_menu.php b/modules/notification/helpers/notification_menu.php index 87927874..696aad62 100644 --- a/modules/notification/helpers/notification_menu.php +++ b/modules/notification/helpers/notification_menu.php @@ -18,19 +18,21 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class notification_menu_Core { - static function album($menu, $theme) { + static function site($menu, $theme) { if (!user::active()->guest) { $item = $theme->item(); - - if ($item) { + + if ($item && $item->is_album()) { $watching = notification::is_watching($item); - $menu + $watching ? $label = t("Remove notifications") : $label = t("Enable notifications"); + + $menu->get("options_menu") ->append(Menu::factory("link") ->id("watch") - ->label(t("Enable notifications for this album")) - ->url(url::site("notification/watch/$item->id?csrf=" . access::csrf_token())) - ->css_id($watching ? "gRemoveNotifyLink" : "gAddNotifyLink")); + ->label($label) + ->css_id("gNotifyLink") + ->url(url::site("notification/watch/$item->id?csrf=" . access::csrf_token()))); } } } diff --git a/themes/default/images/ico-notify-add.png b/themes/default/images/ico-notify-add.png deleted file mode 100644 index 937bfd4f..00000000 Binary files a/themes/default/images/ico-notify-add.png and /dev/null differ diff --git a/themes/default/images/ico-notify-remove.png b/themes/default/images/ico-notify-remove.png deleted file mode 100644 index 8c0f29ca..00000000 Binary files a/themes/default/images/ico-notify-remove.png and /dev/null differ -- cgit v1.2.3 From 71257cedb63c6124e974635e24ec16af77e49586 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Fri, 5 Jun 2009 01:17:16 -0600 Subject: Forgot to remove notify css classes in default theme in previous commit. --- themes/default/css/screen.css | 8 -------- 1 file changed, 8 deletions(-) diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 0dcfd75f..67bd7cc2 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -606,14 +606,6 @@ form .gError, background-image: url('../images/ico-view-album.png'); } -#gViewMenu #gAddNotifyLink { - background-image: url('../images/ico-notify-add.png'); -} - -#gViewMenu #gRemoveNotifyLink { - background-image: url('../images/ico-notify-remove.png'); -} - #gViewMenu #gHybridLink { background-image: url('../images/ico-view-hybrid.png'); } -- cgit v1.2.3 From ab1fc6ad533968ac7cb1d0506e989f549935b7aa Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 5 Jun 2009 19:47:11 -0700 Subject: Make theme page headers match the menu dropdowns. Internationalize the admin dashboard common title. --- modules/gallery/views/admin_theme_details.html.php | 2 +- modules/gallery/views/admin_themes.html.php | 2 +- themes/admin_default/views/admin.html.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gallery/views/admin_theme_details.html.php b/modules/gallery/views/admin_theme_details.html.php index eb450b16..f093b70b 100644 --- a/modules/gallery/views/admin_theme_details.html.php +++ b/modules/gallery/views/admin_theme_details.html.php @@ -1,6 +1,6 @@
-

+

diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php index f85bce70..dc13a6a0 100644 --- a/modules/gallery/views/admin_themes.html.php +++ b/modules/gallery/views/admin_themes.html.php @@ -7,7 +7,7 @@ } -

+

diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php index 63ff3ac7..c1c880ad 100644 --- a/themes/admin_default/views/admin.html.php +++ b/themes/admin_default/views/admin.html.php @@ -4,7 +4,7 @@ - G3: Admin Dashboard + <?= t("Admin Dashboard") ?> " type="image/x-icon" /> " media="screen,projection" /> -- cgit v1.2.3 From c5425f42a4a13f7f585ffe45c070a865cdef6077 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sat, 6 Jun 2009 00:35:30 -0600 Subject: Remove album view icon link, added album link to info module. This and breadcrumb should suffice. --- modules/gallery/helpers/gallery_menu.php | 6 ------ modules/info/views/info_block.html.php | 11 +++++++++++ themes/default/css/screen.css | 4 ---- themes/default/images/ico-view-album.png | Bin 345 -> 0 bytes 4 files changed, 11 insertions(+), 10 deletions(-) delete mode 100644 themes/default/images/ico-view-album.png diff --git a/modules/gallery/helpers/gallery_menu.php b/modules/gallery/helpers/gallery_menu.php index 2a9e193b..97f0fd81 100644 --- a/modules/gallery/helpers/gallery_menu.php +++ b/modules/gallery/helpers/gallery_menu.php @@ -100,12 +100,6 @@ class gallery_menu_Core { ->url("#") ->css_class("gFullSizeLink")); } - $menu - ->append(Menu::factory("link") - ->id("album") - ->label(t("Return to album")) - ->url($theme->item()->parent()->url("show={$theme->item->id}")) - ->css_id("gAlbumLink")); } static function admin($menu, $theme) { diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php index db664894..f8e5f35e 100644 --- a/modules/info/views/info_block.html.php +++ b/modules/info/views/info_block.html.php @@ -17,6 +17,17 @@ name) ?> + id != 1): ?> + parent(); ?> + + + + id}?show=$item->id") ?>"> + title) ?> + + + + captured): ?> diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 67bd7cc2..71711147 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -602,10 +602,6 @@ form .gError, width: 43px !important; } -#gViewMenu #gAlbumLink { - background-image: url('../images/ico-view-album.png'); -} - #gViewMenu #gHybridLink { background-image: url('../images/ico-view-hybrid.png'); } diff --git a/themes/default/images/ico-view-album.png b/themes/default/images/ico-view-album.png deleted file mode 100644 index 20b5af20..00000000 Binary files a/themes/default/images/ico-view-album.png and /dev/null differ -- cgit v1.2.3 From 6c40fd7b14684d4b6d5502cd1b1bfa856a9f0ce7 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sat, 6 Jun 2009 00:44:47 -0600 Subject: New default avatar --- themes/default/images/avatar.jpg | Bin 914 -> 1172 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/themes/default/images/avatar.jpg b/themes/default/images/avatar.jpg index 2e76b12b..acad9314 100644 Binary files a/themes/default/images/avatar.jpg and b/themes/default/images/avatar.jpg differ -- cgit v1.2.3 From cd92b2ed85f063d990412601c19eeed1783be7c4 Mon Sep 17 00:00:00 2001 From: unostar Date: Sun, 7 Jun 2009 01:49:55 +0800 Subject: Adding strings to localizer Signed-off-by: Bharat Mediratta --- themes/admin_default/views/admin.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php index 63ff3ac7..cad23fb5 100644 --- a/themes/admin_default/views/admin.html.php +++ b/themes/admin_default/views/admin.html.php @@ -42,8 +42,8 @@
admin_header_top() ?> ">" id="gLogo" alt="" />
- 

+      

     

     

       
" id="gL10nClientSaveForm">
-- 
cgit v1.2.3


From 3f96830ef111e4358789df25b8afa443df2b4c74 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sat, 6 Jun 2009 12:22:20 -0700
Subject: Properly localize domain url in recaptcha explanation.

---
 modules/recaptcha/views/admin_recaptcha.html.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/recaptcha/views/admin_recaptcha.html.php b/modules/recaptcha/views/admin_recaptcha.html.php
index ed90aea9..1a3bf02d 100644
--- a/modules/recaptcha/views/admin_recaptcha.html.php
+++ b/modules/recaptcha/views/admin_recaptcha.html.php
@@ -2,7 +2,9 @@
 

   
  

   

-    get_key_url}\">ReCaptcha Public/Private Key pair, which is also free.  Once registered, the the challenge and response strings are evaluated at recaptcha.net to determine if the form content has been entered by a bot.", array("url" => "http://recaptcha.net")) ?>
+    ReCaptcha Public/Private Key pair, which is also free.  Once registered, the the challenge and response strings are evaluated at recaptcha.net to determine if the form content has been entered by a bot.",
+          array("domain_url" => $form->get_key_url,
+                "recaptcha_url" => "http://recaptcha.net")) ?>
   

 
      
-- 
cgit v1.2.3


From 6feb640b73f4da9f68cf95b129b32f77dfe65929 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sat, 6 Jun 2009 12:24:08 -0700
Subject: fix typo: "the the" -> "the" (thanks VENCO!)

---
 modules/recaptcha/views/admin_recaptcha.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/recaptcha/views/admin_recaptcha.html.php b/modules/recaptcha/views/admin_recaptcha.html.php
index 1a3bf02d..74932a96 100644
--- a/modules/recaptcha/views/admin_recaptcha.html.php
+++ b/modules/recaptcha/views/admin_recaptcha.html.php
@@ -2,7 +2,7 @@
 

   
  

   

-    ReCaptcha Public/Private Key pair, which is also free.  Once registered, the the challenge and response strings are evaluated at recaptcha.net to determine if the form content has been entered by a bot.",
+    ReCaptcha Public/Private Key pair, which is also free.  Once registered, the challenge and response strings are evaluated at recaptcha.net to determine if the form content has been entered by a bot.",
           array("domain_url" => $form->get_key_url,
                 "recaptcha_url" => "http://recaptcha.net")) ?>
   

-- 
cgit v1.2.3


From 277d72d9fad8777ea5483845155ff87b5ad2ce4c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sat, 6 Jun 2009 12:50:38 -0700
Subject: Fix formatting.

---
 modules/user/views/login.html.php | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php
index 3889f06e..7617d131 100644
--- a/modules/user/views/login.html.php
+++ b/modules/user/views/login.html.php
@@ -1,18 +1,22 @@
 
 
-- 
cgit v1.2.3


From d5d5284f053a435934e8beb55060285803c3748f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sat, 6 Jun 2009 12:52:44 -0700
Subject: Don't ask for CSRF token when trying to view the password reset form.

---
 modules/user/controllers/password.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index 3b0eac66..2dde11b8 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -19,9 +19,9 @@
  */
 class Password_Controller extends Controller {
   public function reset() {
-    access::verify_csrf();
-
     if (request::method() == "post") {
+      // @todo separate the post from get parts of this function
+      access::verify_csrf();
       $this->_send_reset();
     } else {
       print $this->_reset_form();
-- 
cgit v1.2.3


From bccaad92bb3b2ecc7c95e5eaf728b9be6e8a3b3a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sat, 6 Jun 2009 14:50:51 -0700
Subject: Update xss golden file

---
 modules/gallery/tests/xss_data.txt | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index e3dbb188..b71262df 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -283,8 +283,11 @@ modules/image_block/views/image_block_block.html.php         4   DIRTY $item->th
 modules/info/views/info_block.html.php                       6         $item->title
 modules/info/views/info_block.html.php                       11        $item->description
 modules/info/views/info_block.html.php                       17        $item->name
-modules/info/views/info_block.html.php                       23  DIRTY $item->captured
-modules/info/views/info_block.html.php                       29        $item->owner->name
+modules/info/views/info_block.html.php                       25  DIRTY $parent->id
+modules/info/views/info_block.html.php                       25  DIRTY $item->id
+modules/info/views/info_block.html.php                       26        $parent->title
+modules/info/views/info_block.html.php                       34  DIRTY $item->captured
+modules/info/views/info_block.html.php                       40        $item->owner->name
 modules/notification/views/comment_published.html.php        4         $subject
 modules/notification/views/comment_published.html.php        7         $subject
 modules/notification/views/comment_published.html.php        11        $comment->text
@@ -339,9 +342,9 @@ modules/organize/views/organize_thumb_grid.html.php          7   DIRTY $child->i
 modules/organize/views/organize_thumb_grid.html.php          8   DIRTY $child->id
 modules/organize/views/organize_thumb_grid.html.php          8   DIRTY $item_class
 modules/organize/views/organize_thumb_grid.html.php          9   DIRTY $child->thumb_img(array("class" => "gThumbnail"), $thumbsize, true)
-modules/recaptcha/views/admin_recaptcha.html.php             5   DIRTY $form->get_key_url
-modules/recaptcha/views/admin_recaptcha.html.php             8   DIRTY $form
-modules/recaptcha/views/admin_recaptcha.html.php             21  DIRTY $public_key
+modules/recaptcha/views/admin_recaptcha.html.php             6   DIRTY $form->get_key_url
+modules/recaptcha/views/admin_recaptcha.html.php             10  DIRTY $form
+modules/recaptcha/views/admin_recaptcha.html.php             23  DIRTY $public_key
 modules/recaptcha/views/form_recaptcha.html.php              7   DIRTY $public_key
 modules/rss/views/comment.mrss.php                           9         $title
 modules/rss/views/comment.mrss.php                           10  DIRTY $link
@@ -470,11 +473,11 @@ modules/user/views/admin_users_group.html.php                22  DIRTY $user->id
 modules/user/views/admin_users_group.html.php                22  DIRTY $group->id
 modules/user/views/admin_users_group.html.php                25        $user->name
 modules/user/views/admin_users_group.html.php                25        $group->name
-modules/user/views/login.html.php                            11  DIRTY $user->id
-modules/user/views/login.html.php                            14        $user->full_name
-modules/user/views/login.html.php                            14        $user->name
-modules/user/views/login.html.php                            14        $user->full_name
-modules/user/views/login.html.php                            15  DIRTY $csrf
+modules/user/views/login.html.php                            12  DIRTY $user->id
+modules/user/views/login.html.php                            15        $user->full_name
+modules/user/views/login.html.php                            15        $user->name
+modules/user/views/login.html.php                            15        $user->full_name
+modules/user/views/login.html.php                            18  DIRTY $csrf
 modules/user/views/login_ajax.html.php                       37  DIRTY $form
 modules/user/views/reset_password.html.php                   9         $user->full_name
 modules/user/views/reset_password.html.php                   9         $user->full_name
-- 
cgit v1.2.3


From b179b106c2b4d3971498f513ffc71eff1b6b1a5d Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sat, 6 Jun 2009 14:51:04 -0700
Subject: Update Kohana to r4409

---
 system/core/Event.php                       |  4 ++--
 system/helpers/html.php                     | 14 ++++++++++----
 system/libraries/Profiler.php               |  4 ++--
 system/libraries/Router.php                 | 18 +++++++++---------
 system/libraries/drivers/Database/Mssql.php |  2 +-
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/system/core/Event.php b/system/core/Event.php
index 90944c37..06468a8d 100644
--- a/system/core/Event.php
+++ b/system/core/Event.php
@@ -4,7 +4,7 @@
  * to be added to 'events'. Events can be run multiple times, and can also
  * process event-specific data. By default, Kohana has several system events.
  *
- * $Id: Event.php 4358 2009-05-27 17:24:25Z ixmatus $
+ * $Id: Event.php 4390 2009-06-04 03:05:36Z zombor $
  *
  * @package    Core
  * @author     Kohana Team
@@ -206,7 +206,7 @@ final class Event {
 
 			foreach ($callbacks as $callback)
 			{
-				call_user_func_array($callback, array(&$data));
+				call_user_func($callback);
 			}
 
 			// Do this to prevent data from getting 'stuck'
diff --git a/system/helpers/html.php b/system/helpers/html.php
index 9ad20d89..2c609567 100644
--- a/system/helpers/html.php
+++ b/system/helpers/html.php
@@ -2,7 +2,7 @@
 /**
  * HTML helper class.
  *
- * $Id: html.php 4368 2009-05-27 21:58:51Z samsoir $
+ * $Id: html.php 4376 2009-06-01 11:40:39Z samsoir $
  *
  * @package    Core
  * @author     Kohana Team
@@ -68,15 +68,21 @@ class html_Core {
 	 * @param   string  link text
 	 * @param   array   HTML anchor attributes
 	 * @param   string  non-default protocol, eg: https
+	 * @param   boolean option to escape the title that is output
 	 * @return  string
 	 */
-	public static function anchor($uri, $title = NULL, $attributes = NULL, $protocol = NULL)
+	public static function anchor($uri, $title = NULL, $attributes = NULL, $protocol = NULL, $escape_title = FALSE)
 	{
 		if ($uri === '')
 		{
 			$site_url = url::base(FALSE);
 		}
-		elseif (strpos($uri, '://') === FALSE AND strpos($uri, '#') !== 0)
+		elseif (strpos($uri, '#') === 0)
+		{
+			// This is an id target link, not a URL
+			$site_url = $uri;
+		}
+		elseif (strpos($uri, '://') === FALSE)
 		{
 			$site_url = url::site($uri, $protocol);
 		}
@@ -96,7 +102,7 @@ class html_Core {
 		// Attributes empty? Use an empty string
 		.(is_array($attributes) ? html::attributes($attributes) : '').'>'
 		// Title empty? Use the parsed URL
-		.html::specialchars((($title === NULL) ? $site_url : $title), FALSE).'';
+		.($escape_title ? html::specialchars((($title === NULL) ? $site_url : $title), FALSE) : (($title === NULL) ? $site_url : $title)).'';
 	}
 
 	/**
diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php
index 47d82ace..9da053fb 100644
--- a/system/libraries/Profiler.php
+++ b/system/libraries/Profiler.php
@@ -8,7 +8,7 @@
  * POST Data    - The name and values of any POST data submitted to the current page.
  * Cookie Data  - All cookies sent for the current request.
  *
- * $Id: Profiler.php 4090 2009-03-19 01:27:45Z bharat $
+ * $Id: Profiler.php 4383 2009-06-03 00:17:24Z ixmatus $
  *
  * @package    Profiler
  * @author     Kohana Team
@@ -104,7 +104,7 @@ class Profiler_Core {
 		$view = new View('kohana_profiler', $data);
 
 		// Return rendered view if $return is TRUE
-		if ($return == TRUE)
+		if ($return === TRUE)
 			return $view->render();
 
 		// Add profiler data to the output
diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index 6dc9b10c..ef0e1e47 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -2,7 +2,7 @@
 /**
  * Router
  *
- * $Id: Router.php 4350 2009-05-14 18:58:18Z zombor $
+ * $Id: Router.php 4391 2009-06-04 03:10:12Z zombor $
  *
  * @package    Core
  * @author     Kohana Team
@@ -213,17 +213,17 @@ class Router_Core {
 		elseif (isset($_SERVER['PHP_SELF']) AND $_SERVER['PHP_SELF'])
 		{
 			Router::$current_uri = $_SERVER['PHP_SELF'];
-
-			if (($strpos_fc = strpos(Router::$current_uri, KOHANA)) !== FALSE)
-			{
-				// Remove the front controller from the current uri
-				Router::$current_uri = substr(Router::$current_uri, $strpos_fc + strlen(KOHANA));
-			}
 		}
-
+		
+		if (($strpos_fc = strpos(Router::$current_uri, KOHANA)) !== FALSE)
+		{
+			// Remove the front controller from the current uri
+			Router::$current_uri = (string) substr(Router::$current_uri, $strpos_fc + strlen(KOHANA));
+		}
+		
 		// Remove slashes from the start and end of the URI
 		Router::$current_uri = trim(Router::$current_uri, '/');
-
+		
 		if (Router::$current_uri !== '')
 		{
 			if ($suffix = Kohana::config('core.url_suffix') AND strpos(Router::$current_uri, $suffix) !== FALSE)
diff --git a/system/libraries/drivers/Database/Mssql.php b/system/libraries/drivers/Database/Mssql.php
index 6947679a..8b5ed50b 100644
--- a/system/libraries/drivers/Database/Mssql.php
+++ b/system/libraries/drivers/Database/Mssql.php
@@ -298,7 +298,7 @@ class Database_Mssql_Driver extends Database_Driver
 
 	public function field_data($table)
 	{
-		$query = $this->query('SHOW COLUMNS FROM '.$this->escape_table($table), $this->link);
+		$query = $this->query("SELECT COLUMN_NAME AS Field, DATA_TYPE as Type  FROM INFORMATION_SCHEMA.Columns WHERE TABLE_NAME = '".$this->escape_table($table)."'", $this->link);
 
 		return $query->result_array(TRUE);
 	}
-- 
cgit v1.2.3