Changeset 119

Timestamp:

07/19/07 12:51:44 (1 year ago)

Author:

digitalspaghetti

Message:

Adding OpenID component for later. Updated views to new tabbed interface, updated DB for update menu items.

Files:

• branch/app_controller.php (modified) (1 diff)
• branch/config/core.php (modified) (1 diff)
• branch/config/routes.php (modified) (1 diff)
• branch/controllers/components/openid.php (added)
• branch/controllers/events_controller.php (modified) (1 diff)
• branch/controllers/pages_controller.php (modified) (1 diff)
• branch/controllers/posts_controller.php (modified) (2 diffs)
• branch/controllers/users_controller.php (modified) (1 diff)
• branch/db.sql (modified) (24 diffs)
• branch/vendors/Auth (added)
• branch/vendors/Auth/OpenID (added)
• branch/vendors/Auth/OpenID.php (added)
• branch/vendors/Auth/OpenID/Association.php (added)
• branch/vendors/Auth/OpenID/BigMath.php (added)
• branch/vendors/Auth/OpenID/Consumer.php (added)
• branch/vendors/Auth/OpenID/CryptUtil.php (added)
• branch/vendors/Auth/OpenID/DatabaseConnection.php (added)
• branch/vendors/Auth/OpenID/DiffieHellman.php (added)
• branch/vendors/Auth/OpenID/Discover.php (added)
• branch/vendors/Auth/OpenID/DumbStore.php (added)
• branch/vendors/Auth/OpenID/FileStore.php (added)
• branch/vendors/Auth/OpenID/HMACSHA1.php (added)
• branch/vendors/Auth/OpenID/Interface.php (added)
• branch/vendors/Auth/OpenID/KVForm.php (added)
• branch/vendors/Auth/OpenID/MySQLStore.php (added)
• branch/vendors/Auth/OpenID/Parse.php (added)
• branch/vendors/Auth/OpenID/PostgreSQLStore.php (added)
• branch/vendors/Auth/OpenID/SQLStore.php (added)
• branch/vendors/Auth/OpenID/SQLiteStore.php (added)
• branch/vendors/Auth/OpenID/Server.php (added)
• branch/vendors/Auth/OpenID/ServerRequest.php (added)
• branch/vendors/Auth/OpenID/TrustRoot.php (added)
• branch/vendors/Auth/OpenID/URINorm.php (added)
• branch/vendors/Services (added)
• branch/vendors/Services/Yadis (added)
• branch/vendors/Services/Yadis/HTTPFetcher.php (added)
• branch/vendors/Services/Yadis/Manager.php (added)
• branch/vendors/Services/Yadis/Misc.php (added)
• branch/vendors/Services/Yadis/ParanoidHTTPFetcher.php (added)
• branch/vendors/Services/Yadis/ParseHTML.php (added)
• branch/vendors/Services/Yadis/PlainHTTPFetcher.php (added)
• branch/vendors/Services/Yadis/XML.php (added)
• branch/vendors/Services/Yadis/XRDS.php (added)
• branch/vendors/Services/Yadis/XRI.php (added)
• branch/vendors/Services/Yadis/XRIRes.php (added)
• branch/vendors/Services/Yadis/Yadis.php (added)
• branch/views/elements/js_include.ctp (modified) (1 diff)
• branch/views/events/admin_home.ctp (added)
• branch/views/events/admin_index.ctp (modified) (1 diff)
• branch/views/layouts/default.ctp (modified) (1 diff)
• branch/views/pages/admin_home.ctp (added)
• branch/views/pages/admin_index.ctp (modified) (1 diff)
• branch/views/posts/admin_home.ctp (added)
• branch/views/posts/admin_index.ctp (modified) (1 diff)
• branch/views/posts/admin_view.ctp (modified) (1 diff)
• branch/views/posts/index.ctp (modified) (1 diff)
• branch/views/posts/view.ctp (modified) (1 diff)
• branch/views/users/login.ctp (modified) (1 diff)
• branch/webroot/css/default.css (modified) (1 diff)
• branch/webroot/css/jquery.tabs-ie.css (added)
• branch/webroot/css/jquery.tabs.css (added)
• branch/webroot/img/loading.gif (added)
• branch/webroot/img/loading_micro.gif (added)
• branch/webroot/img/tab.png (added)
• branch/webroot/js/jquery.history_remote.pack.js (added)
• branch/webroot/js/jquery.js (modified) (2 diffs)
• branch/webroot/js/jquery.tabs.js (added)
• branch/webroot/js/webrocket.js (modified) (1 diff)

branch/app_controller.php

@@ -40 +40 @@
-        
-        var $helpers = array('othAuth','Cache','Form','Html','Javascript','Text','Number','Time','Tree','Webrocket');
-
+,'Openid'
-        var $othAuthRestrictions = array('add','edit','delete',CAKE_ADMIN);
-        

branch/config/core.php

@@ -55 +55 @@
- * In development mode, you need to click the flash message to continue.
- */
-2
+0
-/**
- * Turn off or enable cache checking application-wide.

branch/config/routes.php

@@ -35 +35 @@
- */
-        Router::connect('/', array('controller' => 'posts', 'action' => 'index'));
+        Router::connect('/admin', array('controller' => 'users', 'action' => 'login'));
-        Router::parseExtensions('rss');
-/**

branch/controllers/events_controller.php

@@ -185 +185 @@
-                $this->set('events',$events);
-        }
+        
+        function admin_home()
+        {
+                
+        }
-
-}

branch/controllers/pages_controller.php

@@ -130 +130 @@
-                }
-        }
+        
+        function admin_home()
+        {
+                
+        }
-
-}

branch/controllers/posts_controller.php

@@ -9 +9 @@
-                                                        'Post.user_id','Post.slug','Post.post_date','Post.access_level',
-                                                        'Post.frontpage','Post.published','User.id','User.username','User.posts_count', 'Subject.id',
-
+,'Image.alt'
-                                        'limit'=>10,
-                                        'order'=>array('Post.post_date'=>'DESC', 'Post.created' => 'DESC')
@@ -193 +193 @@
-                }
-        }
+        
+        function admin_home()
+        {
+                
+        }
-
-}

branch/controllers/users_controller.php

@@ -45 +45 @@
-                        }
-                }
+                //this->set('groups', $this->User->Group->generateList('Group.level <= ' .  $this->level));
-                if(empty($this->data)) {
-                        $this->data = $this->User->read(null, $id);
-                }
-                $tags = $this->User->Tag->generateList();
-                $groups = $this->User->Group->generateList();
-                $this->set(compact('tags','groups'));
-        }
-

branch/db.sql

@@ -4 +4 @@
--- 
--- Host: localhost
-7, 2007 at 05:48
+9, 2007 at 01:47
--- Server version: 5.0.38
--- PHP Version: 5.2.1
@@ -28 +28 @@
--- Dumping data for table `cake_sessions`
--- 
-
-
--- --------------------------------------------------------
-
@@ -409 +407 @@
-  `id` int(8) unsigned NOT NULL auto_increment,
-  `title` varchar(50) NOT NULL,
+  `events_count` int(8) unsigned default '0',
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=5 ;
@@ -416 +415 @@
--- 
-
-
-
-
-
-
+, `events_count`
+, 3
+, 0
+, 0
+, 0
-
--- --------------------------------------------------------
@@ -438 +437 @@
-  `event_ticket1` varchar(255) default NULL,
-  `event_ticket2` varchar(255) default NULL,
-NOT
+default
-  `body` text,
-  `tags` varchar(255) NOT NULL,
@@ -444 +443 @@
-  `subject_id` int(8) unsigned NOT NULL,
-  `published` tinyint(1) NOT NULL,
-NOT
-NOT
-
-AUTO_INCREMENT=5 
+default
+default
+
+
-
--- 
--- Dumping data for table `events`
--- 
-
-
--- --------------------------------------------------------
@@ -470 +468 @@
--- Dumping data for table `events_tags`
--- 
-
-INSERT INTO `events_tags` (`event_id`, `tag_id`) VALUES 
-(4, 1),
-(4, 8);
-
--- --------------------------------------------------------
@@ -636 +630 @@
-  `modified` datetime default NULL,
-  PRIMARY KEY  (`id`)
-AUTO_INCREMENT=5 
+
-
--- 
--- Dumping data for table `images`
--- 
-
-INSERT INTO `images` (`id`, `filename`, `dir`, `mimetype`, `alt`, `subject_id`, `copyright_owner`, `copyright_id`, `image_location`, `image_date`, `image_notes`, `filesize`, `tags`, `user_id`, `created`, `modified`) VALUES 
-(3, 'Quebec_Music_Fest2.jpg', 'files/images', 'image/jpeg', 'The Hedrons @ Quebec Music Fest', 2, 'The Hedrons', 1, 'Quebec, Canada', '2007-07-17', '<p>Hedrons</p>', 764051, 'The Hedrons', NULL, '2007-07-17 12:15:03', '2007-07-17 12:15:03'),
-(4, 'thehedronsjosh.jpg', 'files/images', 'image/jpeg', 'The Hedrons meet QOTSA', 2, 'The Hedrons', 1, 'T In The Park', '2007-07-08', '<p>The Hedrons meet QOTSA</p>', 611260, 'The Hedrons', NULL, '2007-07-17 12:22:49', '2007-07-17 12:22:49');
-
--- --------------------------------------------------------
-
@@ -662 +651 @@
--- Dumping data for table `images_tags`
--- 
-
-INSERT INTO `images_tags` (`image_id`, `tag_id`) VALUES 
-(3, 1),
-(4, 1);
-
--- --------------------------------------------------------
@@ -701 +686 @@
-  `icon` varchar(255) default NULL,
-  `parent_id` int(11) unsigned NOT NULL,
+  `lft` tinyint(4) NOT NULL,
+  `rght` tinyint(4) NOT NULL,
-  `section_id` int(11) unsigned NOT NULL,
-  `access_level` int(3) NOT NULL,
@@ -713 +700 @@
--- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
--- --------------------------------------------------------
@@ -802 +754 @@
-CREATE TABLE `pages` (
-  `id` int(8) unsigned NOT NULL auto_increment,
-tub
+lug
-  `title` varchar(255) NOT NULL,
-  `body` text NOT NULL,
@@ -814 +766 @@
-  `modified` datetime NOT NULL,
-  PRIMARY KEY  (`id`)
-DEFAULT CHARSET=utf8 AUTO_INCREMENT=1
+ DEFAULT CHARSET=utf8 
-
--- 
--- Dumping data for table `pages`
--- 
-
-
--- --------------------------------------------------------
@@ -837 +788 @@
--- Dumping data for table `pages_tags`
--- 
-
-
--- --------------------------------------------------------
@@ -921 +871 @@
-  `body` text NOT NULL,
-  `post_date` datetime NOT NULL,
-NULL
+'0'
-  `user_id` int(8) unsigned NOT NULL,
-  `subject_id` int(8) unsigned NOT NULL,
-  `image_id` int(8) unsigned default NULL,
-  `access_level` int(8) unsigned NOT NULL,
-tub
+lug
-  `tags` varchar(255) NOT NULL,
-  `frontpage` tinyint(1) unsigned default NULL,
@@ -933 +883 @@
-  `modified` datetime default NULL,
-  PRIMARY KEY  (`id`)
-AUTO_INCREMENT=10 
+
-
--- 
--- Dumping data for table `posts`
--- 
-
-INSERT INTO `posts` (`id`, `title`, `byline`, `body`, `post_date`, `comments_count`, `user_id`, `subject_id`, `image_id`, `access_level`, `stub`, `tags`, `frontpage`, `published`, `created`, `modified`) VALUES 
-(7, 'dfgfdgfdgdfg', 'dfgdfgdfgdfgdfg', '<p>dfgdfgdfgdfgdfgdf</p>', '2007-07-17 12:35:00', NULL, 1, 2, 3, 0, 'dfgfdgfdgdfg', 'Dfgdfgdfgdfg', 1, 1, '2007-07-17 12:35:50', '2007-07-17 12:35:50'),
-(6, 'Test Post 2', 'Test Post 2', '<p>The Hedrons meet QOTSA</p>', '2007-07-17 12:23:00', NULL, 1, 2, 4, 0, 'test_post_2', 'The Hedrons', 1, 1, '2007-07-17 12:23:19', '2007-07-17 12:23:19'),
-(5, 'Test', 'Test', '<p>Test</p>', '2007-07-17 12:16:00', NULL, 1, 2, 3, 0, 'test', 'Test', 1, 1, '2007-07-17 12:16:43', '2007-07-17 12:16:43'),
-(8, 'fgdhrtjrtjryj', 'tyejtyjtyjty', '<p>jtyjtyjtyjtyjty</p>', '2007-07-17 12:37:00', NULL, 1, 2, 4, 0, 'fgdhrtjrtjryj', 'Tyjtyj', 1, 1, '2007-07-17 12:37:44', '2007-07-17 12:37:44'),
-(9, 'fgsdfgdfhrthtrhwrth', 'rthrthrthr', '<p>hrthrth</p>', '2007-07-17 12:38:00', NULL, 1, 2, 3, 0, 'fgsdfgdfhrthtrhwrth', 'Ertherttrh', 1, 1, '2007-07-17 12:38:36', '2007-07-17 12:38:36');
-
--- --------------------------------------------------------
@@ -962 +905 @@
--- Dumping data for table `posts_tags`
--- 
-
-INSERT INTO `posts_tags` (`post_id`, `tag_id`) VALUES 
-(5, 13),
-(6, 1),
-(7, 11),
-(8, 14),
-(9, 15);
-
--- --------------------------------------------------------
-
@@ -1129 +1064 @@
-INSERT INTO `subjects` (`id`, `title`, `posts_count`, `pages_count`, `events_count`, `feeds_count`, `images_count`, `galleries_count`, `videos_count`, `created`, `modified`) VALUES 
-(1, 'Uncatagorised', 1, 0, 2, 0, 0, 0, 0, '2007-05-01 17:05:55', '2007-05-01 17:05:55'),
-5, NULL, 1
+1, 1, 3
-(3, 'Wet Wet Wet', 0, NULL, NULL, NULL, NULL, NULL, NULL, '2007-07-06 14:34:09', '2007-07-06 14:34:09');
-
@@ -1143 +1078 @@
-  `tag` varchar(255) collate utf8_unicode_ci NOT NULL,
-  PRIMARY KEY  (`id`)
-AUTO_INCREMENT=16 
+
-
--- 
--- Dumping data for table `tags`
--- 
-
-INSERT INTO `tags` (`id`, `tag`) VALUES 
-(1, 'The Hedrons'),
-(2, 'T In The Park'),
-(3, 'Summer Festivals'),
-(4, 'Festival'),
-(5, 'King Tuts'),
-(6, 'London'),
-(7, '1'),
-(8, 'Usa Tour'),
-(9, 'Test Post'),
-(10, 'Wet Wet Wet'),
-(11, 'Dfgdfgdfgdfg'),
-(12, 'Quebec'),
-(13, 'Test'),
-(14, 'Tyjtyj'),
-(15, 'Ertherttrh');
-
--- --------------------------------------------------------
@@ -1198 +1116 @@
--- Dumping data for table `tags_users`
--- 
-
-
--- --------------------------------------------------------
@@ -1278 +1195 @@
-  `id` int(10) unsigned NOT NULL auto_increment,
-  `username` varchar(50) NOT NULL default '',
-
+
+
-  `name` varchar(50) NOT NULL default '',
-  `email` varchar(100) NOT NULL default '',
-NOT NULL 
+
-  `group_id` int(10) unsigned NOT NULL default '0',
-
-
-
-
-
-
+
+
+
+
+
+
+
-  `active` tinyint(1) unsigned NOT NULL default '0',
-NOT NULL 
-NOT NULL 
+
+
-  PRIMARY KEY  (`id`),
-  UNIQUE KEY `username` (`username`),
@@ -1302 +1221 @@
--- 
-
-passwd`, `name`, `email`, `last_visit`, `group_id`, `profile_id`, `posts_count`, `page
-'fdfedc01c66e9ea2817508ca1097df2f', 'Webrocket Admin', 'admin@webrocket.com', '2007-06-11 17:29:46', 1, 1, 5, 2, 2, 0, '', 1, '2007-03-26 00:00:00', '0000-00-00 00:00:00
-'5aee9dbd2a188839105073571bee1b1f', 'Site', 'Editor', '2007-04-27 10:02:45', 2
-'aa08769cdcb26674c6706093503ff0a3', 'Member', 'member@member.com', '2007-04-26 13:43:34', 3
+openid`, `passwd`, `name`, `email`, `last_visit`, `group_id`, `profile_id`, `posts_count`, `pages_count`, `event
+NULL, 'fdfedc01c66e9ea2817508ca1097df2f', 'Webrocket Admin', 'admin@webrocket.com', '2007-07-19 13:43:56', 1, 1, 1, 1, 1, 2, 0, 'Admin, Owner', 1, '2007-03-26 00:00:00', '2007-07-19 10:45:36
+NULL, '5aee9dbd2a188839105073571bee1b1f', 'Site', 'Editor', '2007-04-27 10:02:45', 2, 0
+NULL, 'aa08769cdcb26674c6706093503ff0a3', 'Member', 'member@member.com', '2007-04-26 13:43:34', 3, 0
-
--- --------------------------------------------------------
@@ -1325 +1244 @@
-  `longitude` decimal(20,15) NOT NULL,
-  `zoom` int(11) NOT NULL default '12',
+  `events_count` int(8) unsigned default '0',
-  `created` datetime default NULL,
-  `modified` datetime default NULL,
@@ -1334 +1254 @@
--- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+events_count`, `
+0, 
+0, 
+0, 
+0, 
+0, 
+0, 
+1, 
+0, 
+0, 
+0, 
+0, 
+0, 
+0, 
+0, 
+0, 
+0, 
+0, 
-
--- --------------------------------------------------------

branch/views/elements/js_include.ctp

@@ -13 +13 @@
-<?php e($javascript->link('jquery.jmaps'));?>
-<?php e($javascript->link('jquery.thickbox'));?>
+<?php e($javascript->link('jquery.tabs'));?>
+<?php e($javascript->link('jquery.history_remote.pack'));?>
-<!-- WymEditor JavaScript-->
-<?php e($javascript->link('wymeditor/jquery.wymeditor'));?>

branch/views/events/admin_index.ctp

@@ -97 +97 @@
-                e('</div>');
-         } ?>
-<div class="actions">
-        <ul>
-                <li><?php echo $html->link(__('New', true).' '.__('Event', true), array('action'=>'add')); ?></li>
-        </ul>
-</div>

branch/views/layouts/default.ctp

@@ -15 +15 @@
-        <?php echo $html->css('jdMenu');?>
-        <?php echo $html->css('jdMenu.slate');?>
+        <?php echo $html->css('jquery.tabs');?>
+        <?php echo $html->css('jquery.tabs.ie');?>
-        <?php echo $html->css('../js/wymeditor/skins/default/screen');?>
-        <?php e($this->element('js_include'));?>

branch/views/pages/admin_index.ctp

@@ -43 +43 @@
-        <h2>There are currently no pages. Click <?php echo $html->link('here', array('action'=>'add')); ?> to create one.</h2>
-<?php } ?>
-<div class="actions">
-        <ul>
-                <li><?php echo $html->link('New Page', array('action'=>'add')); ?></li>
-        </ul>
-</div>

branch/views/posts/admin_index.ctp

@@ -60 +60 @@
-        <h2>There are currently no posts. Click <?php echo $html->link('here', array('action'=>'add')); ?> to create one.</h2>
-<?php } ?>
-<div class="actions">
-        <ul>
-                <li><?php echo $html->link('New Post', array('action'=>'add')); ?></li>
-        </ul>
-</div>

branch/views/posts/admin_view.ctp

@@ -5 +5 @@
-        <span class="vcard author"><?php echo $html->link($post['User']['username'], array('controller'=> 'users', 'action'=>'view', $post['User']['id'])); ?></span>
-        <div class="entry-content">
-
+
+
+
+
+
+
+
+
-        </div>  
-        <div class="meta">

branch/views/posts/index.ctp

@@ -1 +1 @@
-<?php foreach ($posts as $post): ?>
-                <div class="hentry">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                        endforeach;                             
-
-
-
-
-
+
+
+
+
-<?php endforeach; ?>
-

branch/views/posts/view.ctp

@@ -5 +5 @@
-        <span class="vcard author"><?php echo $html->link($post['User']['username'], array('controller'=> 'users', 'action'=>'view', $post['User']['id'])); ?></span>
-        <div class="entry-content">
-
+
+
+
+
+
+
+
+
-        </div>  
-        <div class="meta">

branch/views/users/login.ctp

@@ -1 +1 @@
-<div id="login" class="user-form">
-
+
+
+
+
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        
-
+
+