@@ -24,7 +24,7 @@ class AuthController extends Gam_Controller_Action
$filter = new Zend_Filter_StripTags();
$username = $this->getParam('user');
$password = $this->getParam('password');
- $authAdapter = new Zend_Auth_Adapter_DbTable($this->db);
+ $authAdapter = new Zend_Auth_Adapter_DbTable($this->_db);
$authAdapter
->setTableName('users')
->setIdentityColumn('username')
app/modules/default/controllers/AuthController.php
@@ -6,6 +6,9 @@ class BooksController extends Gam_Controller_Action
'dojoRequires.js',
'dojoStores.js',
'Books.js',
+ 'dynamic' => array(
+ 'gamJs',
+ ),
)
);
@@ -16,6 +19,11 @@ class BooksController extends Gam_Controller_Action
)
);
+ public function gamJs()
+ {
+ //echo "alert('1');";
+ }
+
public function indexAction()
{
}
@@ -49,7 +57,7 @@ class BooksController extends Gam_Controller_Action
private function _getBookInfo($id)
{
- return $this->db->fetchRow("
+ return $this->_db->fetchRow("
SELECT
id id,
title title,
@@ -57,7 +65,8 @@ class BooksController extends Gam_Controller_Action
bookyear bookyear,
readdate readdate,
why why,
- status status
+ status status,
+ isbn isbn
FROM
tblBooks
WHERE
@@ -67,13 +76,13 @@ class BooksController extends Gam_Controller_Action
public function bookeditAction()
{
$this->view->data = $this->__getBookInfo($this->getParam('id'));
- list($this->view->imageUrl, $this->view->imageWidth, $this->view->imageHeight, $this->view->content) = $this->_tryCoverFromAmazon($this->view->data);
+ //list($this->view->imageUrl, $this->view->imageWidth, $this->view->imageHeight, $this->view->content) = $this->_tryCoverFromAmazon($this->view->data);
}
public function bookAction()
{
$this->view->data = $this->_getBookInfo($this->getParam('id'));
- list($this->view->imageUrl, $this->view->imageWidth, $this->view->imageHeight, $this->view->content) = $this->_tryCoverFromAmazon($this->view->data);
+ //list($this->view->imageUrl, $this->view->imageWidth, $this->view->imageHeight, $this->view->content) = $this->_tryCoverFromAmazon($this->view->data);
}
private function _tryCoverFromAmazon($data)
@@ -127,16 +136,18 @@ class BooksController extends Gam_Controller_Action
$status = 9;
} else {
try {
- $this->db->beginTransaction();
- $this->db->query("
+ $this->_db->beginTransaction();
+ $this->_db->query("
UPDATE tblBooks
SET
+ isbn = ?,
title = ?,
author = ?,
bookyear = ?,
why = ?,
status = ?
WHERE id = ?", array(
+ $this->getParam('isbn'),
$this->getParam('title'),
$this->getParam('author'),
$this->getParam('bookyear'),
@@ -144,7 +155,8 @@ class BooksController extends Gam_Controller_Action
$this->getParam('status'),
$this->getParam('id'),
));
- $this->db->commit();
+
+ $this->_db->commit();
$status = 1;
$txt = "Info updated";
} catch (Exception $e) {
@@ -163,13 +175,13 @@ class BooksController extends Gam_Controller_Action
$status = 9;
} else {
try {
- $this->db->beginTransaction();
- $this->db->query("
+ $this->_db->beginTransaction();
+ $this->_db->query("
DELETE FROM tblBooks
WHERE id = ?", array(
$this->getParam('id'),
));
- $this->db->commit();
+ $this->_db->commit();
$status = 1;
$txt = "Book deleted";
} catch (Exception $e) {
@@ -188,13 +200,13 @@ class BooksController extends Gam_Controller_Action
$status = 9;
} else {
try {
- $this->db->beginTransaction();
- $this->db->query("
+ $this->_db->beginTransaction();
+ $this->_db->query("
UPDATE tblBooks SET status=? WHERE id = ? ", array(
$this->getParam('status'),
$this->getParam('id')
));
- $this->db->commit();
+ $this->_db->commit();
$status = 1;
$txt = 'Info updated succesfully';
} catch (Exception $e) {
@@ -213,19 +225,20 @@ class BooksController extends Gam_Controller_Action
$status = 9;
} else {
try {
- $this->db->beginTransaction();
- $id = (integer) $this->db->fetchOne("SELECT max(id) FROM tblBooks") + 1;
- $this->db->query("
- INSERT INTO tblBooks (id, title, author, bookyear, why, status)
- VALUES (?, ?, ?, ?, ?, ?) ", array(
+ $this->_db->beginTransaction();
+ $id = (integer) $this->_db->fetchOne("SELECT max(id) FROM tblBooks") + 1;
+ $this->_db->query("
+ INSERT INTO tblBooks (id, isbn, title, author, bookyear, why, status)
+ VALUES (?, ?, ?, ?, ?, ?, ?) ", array(
$id,
+ $this->getParam('isbn'),
$this->getParam('title'),
$this->getParam('author'),
$this->getParam('bookyear'),
$this->getParam('why'),
$this->getParam('status'),
));
- $this->db->commit();
+ $this->_db->commit();
$txt = "Book added";
$status = 1;
} catch (Exception $e) {
@@ -250,6 +263,6 @@ class BooksController extends Gam_Controller_Action
tblBooks
WHERE
status = ?";
- echo new Zend_Dojo_Data('id', $this->db->fetchAll($sql, array($this->getParam('type'))));
+ echo new Zend_Dojo_Data('id', $this->_db->fetchAll($sql, array($this->getParam('type'))));
}
}
\ No newline at end of file
app/modules/default/controllers/BooksController.php
@@ -13,7 +13,6 @@ class IndexController extends Gam_Controller_Action
'dynamic' => array(
'gamJs',
),
-
)
);
@@ -91,11 +90,11 @@ class IndexController extends Gam_Controller_Action
{
$this->setNoRender();
echo Zend_Json::encode(array(array(
- 'title' => 'My blog',
- 'url' => Zend_Registry::get('config')->myblog->url . Zend_Registry::get('config')->myblog->atom
- ),array(
- 'title' => 'TMZ',
- 'url' => 'http://www.tmz.com/rss.xml'
+ 'title' => 'My blog',
+ 'url' => Zend_Registry::get('config')->myblog->url . Zend_Registry::get('config')->myblog->atom
+ ),array(
+ 'title' => 'TMZ',
+ 'url' => 'http://www.tmz.com/rss.xml'
)));
}
}
app/modules/default/controllers/IndexController.php
@@ -55,10 +55,10 @@ class NotesController extends Gam_Controller_Action
$status = 9;
} else {
try {
- $this->db->beginTransaction();
+ $this->_db->beginTransaction();
- $pk = (integer) $this->db->fetchOne("SELECT max(id) FROM tblNotes") + 1;
- $this->db->query("
+ $pk = (integer) $this->_db->fetchOne("SELECT max(id) FROM tblNotes") + 1;
+ $this->_db->query("
INSERT INTO tblNotes (id, title, body)
VALUES (?, ?, ?) ", array(
$pk,
@@ -67,7 +67,7 @@ class NotesController extends Gam_Controller_Action
));
//$this->_addLuceneDoc($pk, $this->getParam('title'), $this->getParam('body'));
- $this->db->commit();
+ $this->_db->commit();
$status = 1;
$txt = 'Note saved';
} catch (Exception $e) {
@@ -80,7 +80,7 @@ class NotesController extends Gam_Controller_Action
public function noteAction()
{
- $data = $this->db->fetchRow("
+ $data = $this->_db->fetchRow("
SELECT
id id,
title title,
@@ -121,7 +121,7 @@ class NotesController extends Gam_Controller_Action
WHERE
body like '%{$this->getParam('key')}%' OR
title like '%{$this->getParam('key')}%'";
- echo new Zend_Dojo_Data('id', $this->db->fetchAll($sql), array(), Zend_Db::FETCH_OBJ);
+ echo new Zend_Dojo_Data('id', $this->_db->fetchAll($sql), array(), Zend_Db::FETCH_OBJ);
}
private function _luceneDelete($id)
@@ -138,12 +138,12 @@ class NotesController extends Gam_Controller_Action
$status = 9;
} else {
try {
- $this->db->beginTransaction();
+ $this->_db->beginTransaction();
//$this->_luceneDelete($this->getParam('id'));
//$this->_addLuceneDoc($this->getParam('pk'), $this->getParam('title'), $this->getParam('body'));
- $this->db->query("
+ $this->_db->query("
UPDATE tblNotes
SET
title = ?,
@@ -153,7 +153,7 @@ class NotesController extends Gam_Controller_Action
$this->getParam('body'),
$this->getParam('id')
));
- $this->db->commit();
+ $this->_db->commit();
$status = 1;
$txt = 'Note updated';
} catch (Exception $e) {
@@ -172,14 +172,14 @@ class NotesController extends Gam_Controller_Action
$status = 9;
} else {
try {
- $this->db->beginTransaction();
+ $this->_db->beginTransaction();
//$this->_luceneDelete($this->getParam('id'));
- $this->db->query("
+ $this->_db->query("
DELETE FROM tblNotes
WHERE id = ?", array(
$this->getParam('id')
));
- $this->db->commit();
+ $this->_db->commit();
$status = 1;
$txt = 'Note deleted';
} catch (Exception $e) {
app/modules/default/controllers/NotesController.php
@@ -36,7 +36,7 @@ class PlacesController extends Gam_Controller_Action
WHERE
id = ?
";
- $this->view->data = $this->db->fetchRow($sql, array($this->getParam('id')), Zend_Db::FETCH_OBJ);
+ $this->view->data = $this->_db->fetchRow($sql, array($this->getParam('id')), Zend_Db::FETCH_OBJ);
$a=1;
}
@@ -52,7 +52,7 @@ class PlacesController extends Gam_Controller_Action
FROM
tblPlaces
";
- return $this->db->fetchAll($sql, array(), Zend_Db::FETCH_OBJ);
+ return $this->_db->fetchAll($sql, array(), Zend_Db::FETCH_OBJ);
}
public function editAction()
@@ -63,8 +63,8 @@ class PlacesController extends Gam_Controller_Action
$status = 9;
} else {
try {
- $this->db->beginTransaction();
- $this->db->query("
+ $this->_db->beginTransaction();
+ $this->_db->query("
UPDATE tblPlaces
SET
title = ?,
@@ -75,7 +75,7 @@ class PlacesController extends Gam_Controller_Action
$this->getParam('body'),
$this->getParam('id')
));
- $this->db->commit();
+ $this->_db->commit();
$txt = "Place edit";
$status = 1;
} catch (Exception $e) {
@@ -94,9 +94,9 @@ class PlacesController extends Gam_Controller_Action
$status = 9;
} else {
try {
- $this->db->beginTransaction();
- $id = (integer) $this->db->fetchOne("SELECT max(id) FROM tblPlaces") + 1;
- $this->db->query("
+ $this->_db->beginTransaction();
+ $id = (integer) $this->_db->fetchOne("SELECT max(id) FROM tblPlaces") + 1;
+ $this->_db->query("
INSERT INTO tblPlaces (id, lat, lng, title, body)
VALUES (?, ?, ?, ?, ?) ", array(
$id,
@@ -105,7 +105,7 @@ class PlacesController extends Gam_Controller_Action
$this->getParam('title'),
$this->getParam('body')
));
- $this->db->commit();
+ $this->_db->commit();
$txt = "Place added";
$status = 1;
} catch (Exception $e) {
@@ -124,9 +124,9 @@ class PlacesController extends Gam_Controller_Action
$status = 9;
} else {
try {
- $this->db->beginTransaction();
- $this->db->query("DELETE FROM tblPlaces WHERE id = ?", array($this->getParam('id')));
- $this->db->commit();
+ $this->_db->beginTransaction();
+ $this->_db->query("DELETE FROM tblPlaces WHERE id = ?", array($this->getParam('id')));
+ $this->_db->commit();
$txt = "Place deleted";
$status = 1;
} catch (Exception $e) {
app/modules/default/controllers/PlacesController.php
@@ -11,6 +11,10 @@
</td>
</tr>
<tr>
+ <td><label for="name">ISBN: </label></td>
+ <td><input dojoType="dijit.form.TextBox" type="text" name="isbn" style="width:300px;" value="" /></td>
+ </tr>
+ <tr>
<td><label for="name">Title: </label></td>
<td><input dojoType="dijit.form.TextBox" type="text" name="title" style="width:300px;" value="" /></td>
</tr>
app/modules/default/views/scripts/books/add-dialog.phtml
@@ -10,7 +10,7 @@
<button dojoType="dijit.form.Button" onClick='Books.markAs(<?= $this->data->id?>, 1)'>Mark as <i>READING</i></button>
</td>
<?php }?>
-<?php if ($this->data->status!=2) {?>
+<?php if ($this->data->status!=2) {?>
<td align="center">
<button dojoType="dijit.form.Button" onClick='Books.markAs(<?= $this->data->id?>, 2)'>Mark as <i>TO READ</i></button>
</td>
@@ -19,14 +19,46 @@
</table>
<div dojoType="dijit.layout.BorderContainer" design="sidebar" gutters="true" style="height: 350px; width: 650px;">
+
<div dojoType="dijit.layout.ContentPane" region="top" style="height: 50px">
<b><?= $this->data->title?></b><br/><i><?= $this->data->author?> (<?= $this->data->bookyear?>)</i>
</div>
-<?php if ($this->imageUrl) {?>
- <div dojoType="dijit.layout.ContentPane" region="left" style="width: 200px;" align="center">
- <img src="<?= $this->imageUrl?>" alt="<?= $this->data->title?>" height="<?= $this->imageHeight?>" width="<?= $this->imageWidth?>"/>
+
+ <div dojoType="dijit.layout.ContentPane" region="bottom" style="height: 100px">
+ <div id="bookBar-bar">
+ <span style="color:#676767;font-size:11px;margin:10px;padding:4px;">Loading...</span>
+ </div>
+ <style type="text/css">
+ @import url("http://www.google.com/uds/css/gsearch.css");
+ </style>
+ <script src="http://www.google.com/uds/solutions/bookbar/gsbookbar.js?mode=new" type="text/javascript"></script>
+ <style type="text/css">
+ @import url("http://www.google.com/uds/solutions/bookbar/gsbookbar.css");
+ </style>
+ <script type="dojo/connect">
+ window._uds_bbw_donotrepair = true;
+ var bookBar;
+ var options = {
+ largeResultSet : !true,
+ horizontal : true,
+ autoExecuteList : {
+ cycleTime : GSbookBar.CYCLE_TIME_MEDIUM,
+ cycleMode : GSbookBar.CYCLE_MODE_RANDOM,
+ thumbnailSize: GSbookBar.thumbnailsSmall,
+ executeList : ["<?= $this->data->title ?>", "<?= $this->data->author ?>"]
+ }
+ }
+ bookBar = new GSbookBar(document.getElementById("bookBar-bar"), options);
+ </script>
+
</div>
-<?php }?>
+
+ <div dojoType="dijit.layout.ContentPane" region="left" style="width: 200px;" align="center" id='bookImg'>
+ <script type="dojo/connect">
+ Books.googleSearch('<?= $this->data->isbn ?>');
+ </script>
+ </div>
+
<?php if ($this->data->why || $this->content) {?>
<div dojoType="dijit.layout.ContentPane" region="center">
<?php if ($this->data->why) {?>
app/modules/default/views/scripts/books/book.phtml
@@ -1,4 +1,3 @@
-'Books.edit(<?= $this->data->id ?>)'
<form id='edit_book_<?= $this->data->id ?>'>
<table>
<tr>
@@ -12,6 +11,10 @@
</td>
</tr>
<tr>
+ <td><label for="isbn">ISBN: </label></td>
+ <td><input dojoType="dijit.form.TextBox" type="text" name="isbn" style="width:120px;" value="<?= $this->data->isbn?>" /></td>
+ </tr>
+ <tr>
<td><label for="name">Title: </label></td>
<td><input dojoType="dijit.form.TextBox" type="text" name="title" style="width:300px;" value="<?= $this->data->title?>" /></td>
</tr>
app/modules/default/views/scripts/books/edit-book.phtml
@@ -60,12 +60,20 @@ var Books = {
title: 'Book',
href: href,
preventCache: true,
- parseOnLoad: true
+ parseOnLoad: true,
+ onClose: function() {Books.destroyDialogBook()},
+ onCancel : function() {Books.destroyDialogBook()}
+
+
});
Books.dialogBook[id].show();
},
-
+ destroyDialogBook: function() {
+ for(var id in Books.dialogBook){
+ Books.dialogBook[id].destroyRecursive();
+ }
+ },
refreshAllGrids: function() {
Apps.simpleGridRefresh(books.reading);
Apps.simpleGridRefresh(books.toread);
@@ -171,5 +179,54 @@ var Books = {
clearOnClose: true,
});
books.luceneresults.sort();
+ },
+
+ amazonSearch: function (asin) {
+ var scriptElement = document.createElement("script");
+ scriptElement.setAttribute("id", "jsonScript");
+ scriptElement.setAttribute("src", "http://xml-us.amznxslt.com/onca/xml?Service=AWSECommerceService&SubscriptionId=19267494ZR5A8E2CGPR2&AssociateTag=kokogiak7-20&Operation=ItemLookup&Style=http://kokogiak.com/amazon/JSON/ajsonSingleAsin.xsl&ContentType=text/javascript&IdType=ASIN&ItemId=" + asin+ "&ResponseGroup=Large,ItemAttributes,OfferFull&CallBack=Books.amazonCallback");
+ scriptElement.setAttribute("type", "text/javascript");
+ document.documentElement.firstChild.appendChild(scriptElement);
+
+ },
+ amazonCallback: function (booksInfo) {
+ },
+
+ googleSearch: function (bibkeys) {
+ var scriptElement = document.createElement("script");
+ scriptElement.setAttribute("id", "jsonScript");
+ scriptElement.setAttribute("src", "http://books.google.com/books?bibkeys=" + bibkeys + "&jscmd=viewapi&callback=Books.googleCallback");
+ scriptElement.setAttribute("type", "text/javascript");
+ document.documentElement.firstChild.appendChild(scriptElement);
+
+ },
+
+ googleCallback: function (booksInfo) {
+ var div = dojo.byId('bookImg');
+ div.innerHTML = '';
+ var mainDiv = dojo.doc.createElement('div');
+ var x = 0;
+ for (i in booksInfo) {
+ // Create a DIV for each book
+ var book = booksInfo[i];
+ var thumbnailDiv = dojo.doc.createElement('div');
+ thumbnailDiv.className = "thumbnail";
+
+ // Add a link to each book's informtaion page
+ var a = dojo.doc.createElement("a");
+ a.href = book.info_url;
+ a.target = '_blank';
+
+ // Display a thumbnail of the book's cover
+ var img = dojo.doc.createElement("img");
+ img.src = book.thumbnail_url + '&zoom=1';
+ img.border = 0;
+ a.appendChild(img);
+ thumbnailDiv.appendChild(a);
+
+ mainDiv.appendChild(thumbnailDiv);
+ }
+ div.appendChild(mainDiv);
}
-}
\ No newline at end of file
+}
+
app/modules/default/views/scripts/books/js/Books.js
@@ -18,6 +18,10 @@
->appendFile($this->js);
?>
<script src="http://maps.google.com/maps?file=api&v=2&key=<?= Zend_Registry::get('config')->googlemapskey ?>"type="text/javascript"></script>
+ <script src="http://www.google.com/uds/api?file=uds.js&v=1.0&source=uds-bbw&key=<?= Zend_Registry::get('config')->googlemapskey ?>" type="text/javascript"></script>
+
+ <script src="http://www.google.com/uds/solutions/bookbar/gsbookbar.js?mode=new" type="text/javascript"></script>
+
<script type="text/javascript" src="http://www.google.com/jsapi?key=<?= Zend_Registry::get('config')->googlemapskey ?>"></script>
<script src="http://www.google.com/uds/solutions/dynamicfeed/gfdynamicfeedcontrol.js" type="text/javascript"></script>
</head>
app/modules/default/views/scripts/index/index.phtml
@@ -33,6 +33,5 @@ var hideLoader = function(){
dojo.addOnLoad(function(){
dojo.parser.parse();
hideLoader();
-
});
app/modules/default/views/scripts/index/js/dojoRequires.js
@@ -2,6 +2,9 @@ var gamJs = {
feeds: [{
title: "My blog",
url: "<?= Zend_Registry::get('config')->myblog->atom ?>"
+ }, {
+ title: "source",
+ url: "<?= Zend_Registry::get('config')->github ?>"
}
<?php foreach ($this->extraFeeds as $key => $value)
echo ",{title: '{$key}', url: '{$value}'}";
app/modules/default/views/scripts/index/js/gamJs.js
@@ -7,16 +7,14 @@ var Slides = {
imageItemStore: undefined,
handle: function (key, value) {
- console.log('something changed with ' + key + ' : ' + value);
+ //console.log('something changed with ' + key + ' : ' + value);
dojo.xhrPost({
url: '/slides/getSlides/key/' + key,
load: function(responseObject, ioArgs){
- console.log(responseObject);
Slides._slides = responseObject;
for(var index in responseObject){
var imgNode = dojo.doc.createElement('img');
- console.log(index);
dojo.attr(imgNode, 'src', Slides._slides[index]);
dojo.attr(imgNode, 'style', 'Display:none');
dojo.attr(imgNode, 'id', 'pics_' + i);
@@ -40,7 +38,6 @@ var Slides = {
},
changeImg: function(id, index) {
- console.log('changeImg ' + index);
dojo.attr(id + '.current', 'src', Slides._slides[index])
dojo.attr(id + '.next', 'src', Slides._slides[index + 1])
},
app/modules/default/views/scripts/slides/js/Slides.js
db/gam.sqlite
@@ -3,53 +3,54 @@ require_once 'Zend/Controller/Action/Helper/Abstract.php';
class Gam_Action_Helper_FileContent extends Zend_Controller_Action_Helper_Abstract
{
- const JS = 'js';
- const CSS = 'css';
+ const JS = 'js';
+ const CSS = 'css';
- public function js(Gam_Controller_Action $obj, $namespace)
- {
- $this->direct($obj, self::JS, $namespace);
- }
+ public function js(Gam_Controller_Action $obj, $namespace)
+ {
+ $this->direct($obj, self::JS, $namespace);
+ }
- public function css(Gam_Controller_Action $obj, $namespace)
- {
- $this->direct($obj, self::CSS, $namespace);
- }
+ public function css(Gam_Controller_Action $obj, $namespace)
+ {
+ $this->direct($obj, self::CSS, $namespace);
+ }
- public function direct(Gam_Controller_Action $obj, $fileType, $namespace)
- {
- $_data = array();
- switch ($fileType) {
- case self::JS:
- $this->getResponse()->setHeader( 'Content-Type', 'application/javascript' );
- $_data = (array) $obj->{$fileType}[$namespace];
- break;
- case self::CSS:
- $this->getResponse()->setHeader ( 'Content-Type', 'text/css' );
- $_data = (array) $obj->{$fileType}[$namespace];
- break;
- }
+ public function direct(Gam_Controller_Action $obj, $fileType, $namespace)
+ {
+ $_data = array();
+ switch ($fileType) {
+ case self::JS:
+ $this->getResponse()->setHeader('Content-Type', 'application/javascript');
+ $_data = (array) $obj->{$fileType}[$namespace];
+ break;
+ case self::CSS:
+ $this->getResponse()->setHeader('Content-Type', 'text/css');
+ $_data = (array) $obj->{$fileType}[$namespace];
+ break;
+ }
- if (count($_data) > 0) {
- $_arr = array();
- $module = $obj->getRequest()->getModuleName();
+ if (count($_data) > 0) {
+ $_arr = array();
+ $module = $obj->getRequest()->getModuleName();
$controller = $obj->getRequest()->getControllerName();
- $view = new Zend_View();
- foreach ($_data as $key => $item) {
- if (is_string($key) && $key == 'dynamic') {
- foreach ($item as $_item) {
+ $view = new Zend_View();
+ foreach ($_data as $key => $item) {
+ if (is_string($key) && $key == 'dynamic') {
+ foreach ($item as $_item) {
ob_start();
$obj->dispatch($_item);
$out = ob_get_contents();
ob_end_clean();
- $_arr[] = $out;
- }
- } else {
- $view->addScriptPath(GamBASEPATH . "/app/modules/{$module}/views/scripts/{$controller}/{$fileType}/");
- $_arr[] = $view->render("{$item}");
- }
- }
- $out = implode("\n" , $_arr);
+ $_arr[] = $out;
+ }
+ } else {
+ $view->addScriptPath(GamBASEPATH .
+ "/app/modules/{$module}/views/scripts/{$controller}/{$fileType}/");
+ $_arr[] = $view->render("{$item}");
+ }
+ }
+ $out = implode("\n", $_arr);
if (Zend_Registry::get('config')->{$fileType}->minify == 1) {
switch ($fileType) {
case self::JS:
@@ -61,89 +62,6 @@ class Gam_Action_Helper_FileContent extends Zend_Controller_Action_Helper_Abstra
}
}
echo $out;
- }
- }
- /*
- private function get_contents($file)
- {
- return file_get_contents($file);
+ }
}
-
- private function _getFiles(Gam_Controller_Action $obj, $fileType, $namespace)
- {
- $arrData = array ();
- $fileTypeVarName = strtolower ( $fileType );
- if (isset ( $obj->{$fileTypeVarName} [$namespace] ) && is_array ( $obj->{$fileTypeVarName} [$namespace] ) && count ( $obj->{$fileTypeVarName} [$namespace] )) {
- foreach ( $obj->{$fileTypeVarName} [$namespace] as $item ) {
- list ( $module, $controller, $item ) = $this->_decodeNamespace ( $fileType, $item );
- $file = GamBASEPATH . "/app/modules/{$module}/controllers/{$controller}/{$fileType}/{$item}";
- if (is_file ( $file )) {
- $arrData [] = $this->get_contents($file);
- } else {
- throw new Exception ( "{$fileType}:{$item} not found at {$file}" );
- }
- }
- } else {
- throw new Exception("Namespace {$namespace} not valid");
- }
- $out = implode("\n", $arrData);
- switch ($fileType) {
- case self::JS :
- $out = "var user_lang='es';var app_module='{$module}'; var app_controller='{$controller}';{$out}";
- if (Zend_Registry::get('config')->js->minify == 1) {
- $out = JSMin::minify ( $out );
- }
- break;
- case self::CSS :
- if (Zend_Registry::get('config')->css->minify == 1) {
- $out = CSSMin::minify ( $out );
- }
- break;
- }
- return $out;
- }
-
- public function direct(Gam_Controller_Action $obj, $fileType, $namespace)
- {
- switch ($fileType) {
- case self::JS :
- return $this->js ( $obj, $namespace );
- break;
- case self::CSS :
- return $this->css ( $obj, $namespace );
- break;
- }
- }
-
- private function _decodeNamespace($type, $namespace)
- {
- $module = Zend_Controller_Front::getInstance()->getRequest()->getModuleName();
- $controller = Zend_Controller_Front::getInstance()->getRequest()->getControllerName();
- if (strpos ( $namespace, '/' ) !== false) {
- $fArr = explode ( '/', $namespace );
- $filename = $fArr [1];
- if (strpos ( $fArr [0], ':' ) !== false) {
- $fArr2 = explode ( ':', $fArr [0] );
- $module = $fArr2 [0];
- $controller = $fArr2 [1];
- } else
- $controller = $fArr [0];
- } else
- $filename = $namespace;
- return array ($module, ucfirst($controller), $filename );
- }
-
- public function js(Gam_Controller_Action $obj, $namespace)
- {
- $this->getResponse ()->setHeader ( 'Content-Type', 'application/javascript' );
- echo $this->_getFiles ( $obj, self::JS, $namespace );
-
- }
-
- public function css(Gam_Controller_Action $obj, $namespace)
- {
- $this->getResponse ()->setHeader ( 'Content-Type', 'text/css' );
- echo $this->_getFiles ( $obj, self::CSS, $namespace );
- }
- */
}
\ No newline at end of file
library/Gam/Action/Helper/FileContent.php
@@ -21,13 +21,13 @@ class Gam_Comet
{
$_timestamp = time();
$out = array();
- for($i=0; $i<self::COMET_TRIES; $i++) {
+ for ($i=0; $i<self::COMET_TRIES; $i++) {
foreach ($ids as $id => $timestamp) {
if ((integer) $timestamp == 0) {
$timestamp = $_timestamp;
}
$fileTimestamp = self::_get($id);
- if ($fileTimestamp > $timestamp){
+ if ($fileTimestamp > $timestamp) {
$out[$id] = ($output) ? $fileTimestamp : '';
}
clearstatcache();
library/Gam/Comet.php
@@ -1,16 +1,17 @@
<?php
class Gam_Controller_Action extends Zend_Controller_Action
{
- protected $security = array(
- 'guest' => 'allow',
- 'member' => 'allow',
- 'admin' => 'allow',
- );
-
- public function init()
- {
- $this->acl($this->security);
- }
+ protected $_security = array(
+ 'guest' => 'allow',
+ 'member' => 'allow',
+ 'admin' => 'allow',
+ );
+
+ public function init()
+ {
+ $this->acl($this->_security);
+ }
+
protected function setNoRender()
{
$this->_helper->viewRenderer->setNoRender();
@@ -23,17 +24,17 @@ class Gam_Controller_Action extends Zend_Controller_Action
protected function acl($security)
{
- $acl = Zend_Registry::get ( 'acl' );
+ $acl = Zend_Registry::get('acl');
$module = Zend_Controller_Front::getInstance()->getRequest()->getModuleName();
- $controller = Zend_Controller_Front::getInstance()->getRequest()->getControllerName();
+ $controller = Zend_Controller_Front::getInstance()->getRequest()->getControllerName();
- $resource = "{$module}_{$controller}";
+ $resource = "{$module}_{$controller}";
- $acl->add(new Zend_Acl_Resource($resource));
- foreach ($security as $role => $action) {
- $acl->$action($role, $resource);
- }
- $acl = Zend_Registry::set ( 'acl', $acl);
+ $acl->add(new Zend_Acl_Resource($resource));
+ foreach ($security as $role => $action) {
+ $acl->$action($role, $resource);
+ }
+ $acl = Zend_Registry::set('acl', $acl);
}
private function _url2($module, $controller, $action, $params=array())
@@ -59,11 +60,11 @@ class Gam_Controller_Action extends Zend_Controller_Action
}
protected function getClientUrl($type, $namespace)
- {
- $module = Zend_Controller_Front::getInstance()->getRequest()->getModuleName();
- $controller = Zend_Controller_Front::getInstance()->getRequest()->getControllerName();
- return $this->_url($module, $controller, $type, array('file' => $namespace));
- }
+ {
+ $module = Zend_Controller_Front::getInstance()->getRequest()->getModuleName();
+ $controller = Zend_Controller_Front::getInstance()->getRequest()->getControllerName();
+ return $this->_url($module, $controller, $type, array('file' => $namespace));
+ }
protected function getParam($param, $default=null)
{
@@ -76,12 +77,13 @@ class Gam_Controller_Action extends Zend_Controller_Action
/**
* @var Zend_Db_Adapter_Pdo_Abstract
*/
- protected $db;
+ protected $_db;
- public function __construct(Zend_Controller_Request_Abstract $request, Zend_Controller_Response_Abstract $response, array $invokeArgs = array())
+ public function __construct(Zend_Controller_Request_Abstract $request,
+ Zend_Controller_Response_Abstract $response, array $invokeArgs = array())
{
- $this->db = Zend_Registry::get('db');
- parent::__construct ( $request, $response, $invokeArgs );
+ $this->_db = Zend_Registry::get('db');
+ parent::__construct($request, $response, $invokeArgs);
}
protected function getIdentity()
@@ -101,9 +103,9 @@ class Gam_Controller_Action extends Zend_Controller_Action
$auth = Zend_Auth::getInstance();
$module = Zend_Controller_Front::getInstance()->getRequest()->getModuleName();
- $controller = Zend_Controller_Front::getInstance()->getRequest()->getControllerName();
- $resource = "{$module}_{$controller}";
- $acl = Zend_Registry::get ( 'acl' );
+ $controller = Zend_Controller_Front::getInstance()->getRequest()->getControllerName();
+ $resource = "{$module}_{$controller}";
+ $acl = Zend_Registry::get('acl');
$identity = is_null($auth->getIdentity()) ? 'guest' : $auth->getIdentity();
if (!$acl->isAllowed($identity, $resource)) {
if (!$auth->hasIdentity()) {
@@ -115,40 +117,34 @@ class Gam_Controller_Action extends Zend_Controller_Action
public function jsAction()
{
$this->_helper->viewRenderer->setNoRender();
- echo $this->_helper->getHelper ('FileContent')->js($this, $this->_getParam('file'));
+ echo $this->_helper->getHelper('FileContent')->js($this, $this->_getParam('file'));
}
public function cssAction()
{
$this->_helper->viewRenderer->setNoRender();
- echo $this->_helper->getHelper ('FileContent')->css($this, $this->_getParam('file'));
+ echo $this->_helper->getHelper('FileContent')->css($this, $this->_getParam('file'));
}
-
-
-
public function jsAction2()
{
-
-
- $js = $this->_getParam ( 'file' );
- if (! is_null ( $js )) {
- $this->_helper->viewRenderer->setNoRender ();
- echo $this->_helper->getHelper ( 'FileContent' )->js ( $this, ( string ) $js );
+ $js = $this->_getParam('file');
+ if (! is_null($js)) {
+ $this->_helper->viewRenderer->setNoRender();
+ echo $this->_helper->getHelper('FileContent')->js($this, (string) $js);
} else {
- throw new Exception ( "js namespace ({$js}) not found" );
+ throw new Exception("js namespace ({$js}) not found");
}
}
-
public function cssAction2()
{
- $css = $this->_getParam ( 'file' );
- if (! is_null ( $css )) {
- $this->_helper->viewRenderer->setNoRender ();
- echo $this->_helper->getHelper ( 'FileContent' )->css ( $this, ( string ) $css );
+ $css = $this->_getParam('file');
+ if (! is_null($css)) {
+ $this->_helper->viewRenderer->setNoRender();
+ echo $this->_helper->getHelper('FileContent')->css($this, (string) $css);
} else {
- throw new Exception ( "css namespace ({$css}) not found" );
+ throw new Exception("css namespace ({$css}) not found");
}
}
}
\ No newline at end of file
library/Gam/Controller/Action.php
@@ -1,4 +1,5 @@
<?php
-interface Gam_Controller_Interface {
+interface Gam_Controller_Interface
+{
public $js = array();
}
library/Gam/Controller/Interface.php
@@ -30,26 +30,26 @@ class Gam_Controller_Router_Route_RequestVars implements Zend_Controller_Router_
$frontController = Zend_Controller_Front::getInstance();
$request = $frontController->getRequest();
/* @var $request Zend_Controller_Request_Http */
-
+
$baseUrl = $request->getBaseUrl();
if (strpos($baseUrl, 'index.php') !== false) {
$url = str_replace('index.php', '', $baseUrl);
$request->setBaseUrl($url);
}
-
+
$params = $request->getParams();
-
+
if (array_key_exists('module', $params)
|| array_key_exists('controller', $params)
|| array_key_exists('action', $params)) {
-
+
$module = $request->getParam('module', $frontController->getDefaultModule());
$controller = $request->getParam('controller', $frontController->getDefaultControllerName());
$action = $request->getParam('action', $frontController->getDefaultAction());
- $result = array('module' => $module,
- 'controller' => $controller,
- 'action' => $action,
+ $result = array('module' => $module,
+ 'controller' => $controller,
+ 'action' => $action,
);
$this->_current = $result;
return $result;
@@ -66,27 +66,27 @@ class Gam_Controller_Router_Route_RequestVars implements Zend_Controller_Router_
public function assemble($data = array(), $reset=false, $encode = false)
{
$frontController = Zend_Controller_Front::getInstance();
-
- if(!array_key_exists('module', $data) && !$reset
+
+ if (!array_key_exists('module', $data) && !$reset
&& array_key_exists('module', $this->_current)
&& $this->_current['module'] != $frontController->getDefaultModule()) {
$data = array_merge(array('module'=>$this->_current['module']), $data);
}
- if(!array_key_exists('controller', $data) && !$reset
- && array_key_exists('controller', $this->_current)
+ if (!array_key_exists('controller', $data) && !$reset
+ && array_key_exists('controller', $this->_current)
&& $this->_current['controller'] != $frontController->getDefaultControllerName()) {
$data = array_merge(array('controller'=>$this->_current['controller']), $data);
}
- if(!array_key_exists('action', $data) && !$reset
+ if (!array_key_exists('action', $data) && !$reset
&& array_key_exists('action', $this->_current)
&& $this->_current['action'] != $frontController->getDefaultAction()) {
$data = array_merge(array('action'=>$this->_current['action']), $data);
}
-
+
$url = '';
- if(!empty($data)) {
+ if (!empty($data)) {
$urlParts = array();
- foreach($data as $key=>$value) {
+ foreach ($data as $key => $value) {
$urlParts[] = $key . '=' . $value;
}
$url = '?' . implode('&', $urlParts);
library/Gam/Controller/Router/Route/RequestVars.php
c3fcb9bfa2b0a17ad5643a74b4788d0bf19a3dd2
gonzalo
gonzalo123
gonzalo123@gmail.com
http://github.com/gonzalo123/gam/commit/d781cae877ec7cd14841fc22410907310b78fb1e
d781cae877ec7cd14841fc22410907310b78fb1e
2009-01-19T10:44:08-08:00
2009-01-19T10:44:08-08:00
book image with js + Source code clean
65a63ca19a8a81df3e4f64d17dfd9c2ccb2f8e11
gonzalo
gonzalo123
gonzalo123@gmail.com