lib/model/WildfireNotifier.php
resources/public/javascripts/build/wildfire_cms.combined.js
resources/public/javascripts/build/wildfire_cms.combined.min.js
resources/public/javascripts/build/wildfire_filesystem.js
resources/public/javascripts/build/wildfire_filesystem.min.js
view/CMSAdminSectionController/filters.html
view/wildfire_notifier/comment_approval.txt
@@ -55,11 +55,24 @@ class CMSAdminComponent extends WaxController {
public $permissions = array();
function __construct($initialise = true) {
+ parent::__construct($initialise);
$this->permissions = array_unique(array_merge($this->base_permissions,$this->permissions));
$this->help_files = array_unique(array_merge($this->extra_help, $this->base_help));
if($initialise) $this->initialise();
}
+ public function __destruct(){
+ $log = new WildfireLog;
+ $log->controller=$this->controller;
+ $log->action=$this->action;
+ $log->page=$this->id;
+ if(Request::param('lang')) $log->language = Request::param('lang');
+ $log->user=$this->current_user->id;
+ $log->time = date("Y-m-d H:i:s");
+ $log->save();
+ }
+
+
/**
* initialises authentication, default model and menu items
**/
@@ -99,6 +112,7 @@ class CMSAdminComponent extends WaxController {
public function check_authorised() {
if($this->current_user) return $this->current_user->access($this->module_name, 'view');
Session::add_message($this->unauthorised_message);
+ Session::set('pre_login_referrer', $_SERVER['REQUEST_URI']);
$this->redirect_to($this->unauthorised_redirect);
}
@@ -157,10 +171,10 @@ class CMSAdminComponent extends WaxController {
*/
public function filter() {
$this->use_layout=false;
- if($_POST['filter']) {
+ if($filter_val = Request::param('filter')) {
$conditions = "";
if($this->filter_columns) {
- foreach($this->filter_columns as $filter) $conditions .= "OR $filter LIKE '%{$_POST['filter']}%'";
+ foreach($this->filter_columns as $col) $conditions .= "OR $col LIKE '%".$filter_val."%'";
$conditions = ltrim($conditions, "OR");
}
$this->model->filter($conditions);
lib/controller/CMSAdminComponent.php
@@ -175,6 +175,10 @@ class CMSAdminContentController extends AdminComponent {
$preview->status = 4;
$preview->preview_master_id = $master->primval;
$ret = $preview->save();
+
+ //temp fix.... images not copying properly
+ $preview->images= $master->images;
+ $preview->categories = $master->categories;
}
return $ret;
}
@@ -190,10 +194,14 @@ class CMSAdminContentController extends AdminComponent {
$preview->set_attributes($_POST[$preview->table]);
$preview->status = 4;
$preview->save();
- foreach($preview->columns as $col => $params) if($preview->$col) $copy_attributes[$col] = $preview->$col;
+
+ foreach($preview->columns as $col => $params) if($preview->$col || strlen($preview->$col)) $copy_attributes[$col] = $preview->$col;
+
$copy_attributes = array_diff_key($copy_attributes,array_flip(array($preview->primary_key,"master","status"))); //take out IDs and status
- return $master->update_attributes($copy_attributes);
- }else return $master;
+ $res = $master->update_attributes($copy_attributes);
+ }else $res = $master;
+ $this->after_save($res);
+ return $res;
}
/**
* the editing function... lets you change all the bits associated with the content record
@@ -246,7 +254,9 @@ class CMSAdminContentController extends AdminComponent {
}
//images
- if(!$this->attached_images = $this->model->images) $this->attached_images=array();
+ if(count($this->model->images)) $this->attached_images=$this->model->images;
+ elseif($this->model->master && $this->model->master->primval && $this->model->master->images && $this->model->master->images->count()) $this->attached_images=$this->model->master->images;
+ else $this->attached_images = array();
//categories assocaited
if(!$this->attached_categories = $this->model->categories) $this->attached_categories= array();
@@ -338,6 +348,7 @@ class CMSAdminContentController extends AdminComponent {
* cool function that autosaves your current document via ajax call
**/
public function autosave() {
+ $this->id = Request::get("id");
$this->use_layout=false;
$this->use_view=false;
$content = new $this->model_class(Request::get("id"));
lib/controller/CMSAdminContentController.php
@@ -49,7 +49,8 @@ class CMSAdminHomeController extends AdminComponent {
$log->save();
$perm_model = new CmsPermission;
if(!count($perm_model->all())) return '/admin/home/convert_to_v3';
- elseif($this->authorised_redirect) return $this->authorised_redirect;
+ elseif(Session::get('pre_login_referrer')) return Session::get('pre_login_referrer');
+ elseif($this->authorised_redirect) return $this->authorised_redirect;
else return 'index';
}
else {
lib/controller/CMSAdminHomeController.php
@@ -65,26 +65,19 @@ class CMSAdminSectionController extends AdminComponent {
}
/**
- * Ajax Filter list view
- */
- public function filter() {
- $this->use_layout=false;
- $this->use_view="_list";
- if($fil = Request::post('filter')) {
- $conditions = "";
- if($this->filter_columns) {
- foreach($this->filter_columns as $filter) {
- $conditions .= "OR $filter LIKE ?";
- $params[]='%'.$fil.'%';
- }
- $conditions = ltrim($conditions, "OR");
- }
- $this->model->filter($conditions, $params);
- }
- $this->all_rows = $this->model->order($this->get_order())->limit($this->list_limit)->all();
+ * ajax filter function - takes the incoming string, matches against columns
+ * and outputs view of the matching data
+ */
+ public function filters() {
+ $this->use_layout = false;
+ $sect = new CmsSection();
+ if($filter = Request::param('filter')) $sect->filter("title",'%'.$filter.'%', "LIKE");
+ $this->all_sections = $sect->tree();
+ $this->use_view = "_section_list";
+ $this->all_sections_partial = $this->render_partial("section_list");
}
}
-?>
\ No newline at end of file
+?>
lib/controller/CMSAdminSectionController.php
@@ -17,6 +17,7 @@ class CMSAdminUserController extends AdminComponent {
);
public $filter_columns = array("username", "email");
public $order_by_columns = array("username","email");
+ public $default_order = "username";
public $permissions = array("create","edit","delete","admin");
@@ -51,7 +52,7 @@ class CMSAdminUserController extends AdminComponent {
$this->all_permissions = new WaxRecordSet(new CmsPermission, $this->all_permissions);
$this->all_users = new $this->model_class;
- $this->all_users = $this->all_users->filter("id",$this->model->primval,"!=")->all();
+ $this->all_users = $this->all_users->filter("id",$this->model->primval,"!=")->order("username")->all();
$this->exisiting_modules_partial = $this->render_partial("list_modules");
$this->list_modules_partial = $this->render_partial("module_list");
@@ -92,7 +93,10 @@ class CMSAdminUserController extends AdminComponent {
public function add_permission(){
$this->model = new $this->model_class(WaxUrl::get("id"));
- list($prefix, $class, $operation) = explode("_",Request::param('tagid'));
+ $exp = explode("_",Request::param('tagid'));
+ $prefix = $exp[0];
+ $class = $exp[1];
+ $operation = str_ireplace($prefix."_".$class."_","", Request::param('tagid'));
if(!$this->model->access($class, $operation)){
$permission = new CmsPermission;
$permission->class = $class;
@@ -119,7 +123,7 @@ class CMSAdminUserController extends AdminComponent {
$this->model = new $this->model_class(WaxUrl::get("id"));
$copy_from = new $this->model_class(WaxUrl::get("copy_from"));
if(!$copy_from->primval) return;
- $this->model->permissions->delete();
+ foreach($this->model->permissions as $perm) $perm->delete();
foreach($copy_from->permissions as $old_perm){
$permission = new CmsPermission;
$permission->class = $old_perm->class;
lib/controller/CMSAdminUserController.php
@@ -51,7 +51,7 @@ class CmsTextFilter {
}
static public function strip_attributes($text) {
- $text = preg_replace("/<(table|td|tr|tbody|thead|tfoot)\s+([^>]*)(border|bgcolor|background|style)+([^>]*)>/i", "<$1 $2 $3\>", $text);
+ $text = preg_replace("/<(table|td|tr|tbody|thead|tfoot|p)\s+([^>]*)(border|bgcolor|background|style)+([^>]*)>/i", "<$1 $2 $3\>", $text);
return preg_replace("/<(p|h1|h2|h3|h4|h5|h6|ul|ol|li|span|font)\s+([^>]*)( class=\".*?\")([^>]*)>/i", "<$1$3>", $text);
}
@@ -97,7 +97,7 @@ class CmsTextFilter {
static public function ampersand_hook($text) {
$amp_finder = "/(\s| )(&|&|&\#38;)(\s| )/";
- return preg_replace($amp_finder, '\\1<span class="amp">&</span>\\3', $text);
+ return preg_replace($amp_finder, '\\1&\\3', $text);
}
static public function nice_quotes($text) {
@@ -245,11 +245,12 @@ class CmsTextFilter {
static public function inline_images($text) {
$matches=array();
preg_match_all("/<img([^>]*class=\"inline_image[^>]*)>/", $text, $matches, PREG_SET_ORDER);
-
foreach($matches as $match) {
- preg_match("/width=\"([0-9]*)\"/", $match[0], $width);
- preg_match("/WIDTH:\s*([0-9]*)/", $match[0], $width);
+ if(!preg_match("/width=\"([0-9]*)\"/i", $match[0], $width)) {
+ preg_match("/WIDTH:\s*([0-9]*)/i", $match[0], $width);
+ }
$width = $width[1];
+
if($width) {
$new_img = preg_replace("/(.*show_image\/[0-9]*\/)([0-9]*)(.*)/", "\${1}$width\\3", $match[0]);
$new_img = preg_replace("/width=\"[0-9]*\"/", "", $new_img);
lib/filters/CmsTextFilter.php
@@ -26,8 +26,8 @@ class Campaign extends CampaignMonitorModel {
$this->define("FromEmail", "EmailField", array('maxlength'=>255, 'required'=>true) );
$this->define("ConfirmationEmail","EmailField", array('maxlength'=>255, 'required'=>true) );
$this->define("ReplyTo", "CharField", array('maxlength'=>255, 'required'=>true) );
- $this->define("HtmlUrl", "TextField", array('maxlength'=>255, 'required'=>true) );
- $this->define("TextUrl", "TextField", array('maxlength'=>255, 'required'=>true) );
+ $this->define("HtmlUrl", "TextField", array('required'=>true) );
+ $this->define("TextUrl", "TextField", array('required'=>true) );
$this->define("SendDate", "DateTimeField");
$this->define("SubscriberListIDs", "TextField");
$this->define("ListSegments", "TextField");
lib/model/Campaign.php
@@ -36,6 +36,24 @@ class CmsComment extends WaxModel {
$this->flag_spam();
}
+ public function after_insert(){
+ if($email_config = Config::get("notifiers")) {
+
+ if($this->status == 0 || $this->status == 2){
+ $verification_email = new WildfireNotifier;
+ $verification_email->add_to_address($email_config["comment_email_to"]);
+
+ $data["id"] = $this->id;
+ $data["author_name"] = $this->author_name;
+ $data["author_email"] = $this->author_email;
+ $data["comment"] = $this->comment;
+ $data["attached_to"] = $this->attached_to;
+
+ $verification_email->send_comment_approval($data);
+ }
+ }
+ }
+
public function article() {
return $this->attached_to;
}
@@ -75,6 +93,7 @@ class CmsComment extends WaxModel {
}
protected function flag_spam() {
+ $comment_settings = Config::get("comments");
$text = $this->comment;
$total_matches = 0;
$trash = array();
@@ -99,7 +118,10 @@ class CmsComment extends WaxModel {
if(strlen($text > 1000)) $total_matches +=2;
if(strlen($text < 13)) $total_matches +=2;
if($total_matches >= 4) $this->status="2";
- elseif(!$this->status) $this->status="1";
+ else{
+ if($comment_settings['default_unapproved']) $this->status = "0";
+ else $this->status = "1";
+ }
}
/*************** OLD FUNCTIONS - TO BE REMOVED - SOME ALREADY RETURN FALSE ********************/
lib/model/CmsComment.php
@@ -126,8 +126,9 @@ class CmsContent extends WaxModel {
if($this->primval) $model->filter($this->primary_key.' <> '.$this->primval);
$count = 0;
while($model->filter(array('url'=>$test_url, 'cms_section_id'=>$this->cms_section_id))->filter('status <> 4')->first() ){
- if($count == 0) $test_url = $original_url . '-'.date("Y-m-d");
- elseif($count == 1) $test_url = $original_url . '-'.$this->primval;
+ if($count == 0) $test_url = $original_url . '-'.$this->published;
+ elseif($count == 1) $test_url = $original_url . '-'.date("Y-m-d");
+ elseif(($count == 2) && $this->primval()) $test_url = $original_url . '-'.$this->primval();
else $test_url = $original_url . '-'.mt_rand(0,99);
$count++;
}
lib/model/CmsContent.php
@@ -4,7 +4,10 @@ class WildfireLog extends WaxModel {
public function setup() {
+ $this->define("language", "CharField");
+ $this->define("page", "CharField");
$this->define("action", "CharField");
+ $this->define("controller", "CharField");
$this->define("user", "ForeignKey", array("target_model"=>"WildfireUser"));
$this->define("time", "DateTimeField");
}
@@ -17,6 +20,10 @@ class WildfireLog extends WaxModel {
return date('jS F Y @ H:i', strtotime($this->time));
}
+ public function action_description() {
+ return $this->controller." ".$this->action." ".$this->page;
+ }
+
}
?>
\ No newline at end of file
lib/model/WildfireLog.php
@@ -1 +1 @@
-Subproject commit 9effa475e2e8a7af3c4ba6ff3ce58fb888a36160
+Subproject commit bda4de36d61b979ad402c3b49438e58a24e63119
resources/public/javascripts/jqwysi
@@ -110,7 +110,7 @@ td, th {
p{
margin:10px 0px;
}
-
+.dropped_image p, .drag_image p{margin:1px 0;text-align:center;}
/* HEADER */
#main-navigation-container{
@@ -397,7 +397,7 @@ h4{
margin:0 10px 10px 0;
padding:5px 6px;
width:140px;
- height:140px;
+ height:150px;
border:1px solid #ebebeb;
text-align:center;
font-size:85%;
resources/public/stylesheets/cms/cms-stylesheet.css
@@ -521,7 +521,7 @@ td, th {
p{
margin:10px 0px;
}
-
+.dropped_image p, .drag_image p{margin:1px 0;text-align:center;}
/* HEADER */
#main-navigation-container{
@@ -808,7 +808,7 @@ h4{
margin:0 10px 10px 0;
padding:5px 6px;
width:140px;
- height:140px;
+ height:150px;
border:1px solid #ebebeb;
text-align:center;
font-size:85%;
resources/public/stylesheets/cms/wildfire.combined.css
@@ -6,6 +6,7 @@
<div class="image_place">
<img src="<?=$image->permalink(135)?>" title="<?=$image->description?>" />
</div>
+ <p><?=$image->filename?></p>
<div class="remove_image" id="delete_image_<?=$image->id?>">
<a href="#">Remove</a>
</div>
view/CMSAdminContentController/_content_images.html
@@ -4,6 +4,7 @@
<div class="image_place">
<img src="<?=$attached_images[$i]->permalink(135)?>" title="<?=$attached_images[$i]->description?>" />
</div>
+ <p><small><?=$attached_images[$i]->filename?></small></p>
<div class="remove_image" id="delete_image_<?=$id?>">
<a href="#">Remove</a>
</div>
view/CMSAdminContentController/attached_images.html
@@ -4,6 +4,7 @@
<div class="image_place">
<img src="<?=$image->permalink(135)?>" title="<?=$image->filename?>" alt="<?=$image->description?>"/>
</div>
+ <p><?=$image->filename?></p>
<div class="add_image" id="add_image_<?=$image->id?>">
<a href="#">Add</a>
</div>
view/CMSAdminFileController/_list_all_images.html
@@ -1,5 +1,5 @@
-<script type="text/javascript" src="/javascripts/build/jquery.126.files.min.js"></script>
+<script type="text/javascript" src="/javascripts/build/wildfire_filesystem.min.js"></script>
<div id="advanced_uploader" class="clearfix wf_dialog">
view/CMSAdminFileController/upload.html
@@ -20,10 +20,11 @@
google.load('jqueryui', '1.7');
</script>
<?else:?>
- <script type="text/javascript" charset="utf-8" src="/javascripts/build/jquery.1.3.2.js"></script>
+ <script type="text/javascript" charset="utf-8" src="/javascripts/jquery/jquery.1.3.2.js"></script>
+ <script type="text/javascript" charset="utf-8" src="/javascripts/jquery/jquery-ui-1.7.1.custom.min.js"></script>
<?endif?>
- <script type="text/javascript" charset="utf-8" src="/javascripts/build/jquery.132.combined.js"></script>
+ <script type="text/javascript" charset="utf-8" src="/javascripts/build/wildfire_cms.combined.min.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/jqwysi/build/jquery.wymeditor.min.js"></script>
<script type="text/javascript" charset="utf-8" src="/javascripts/jqwysi/src/wymeditor/plugins/wildfire/jquery.wymeditor.wildfire.js"></script>
<script src="/javascripts/cms/cms_application.js" type="text/javascript"></script>
view/layouts/admin.html
@@ -4,10 +4,27 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <?=javascript_asset("build", "jquery.126.files.min")?>
+ <?if(ENV == "production"):?>
+ <script src='http://www.google.com/jsapi?' type='text/javascript'></script>
+ <script type='text/javascript'>
+ google.load('jquery', '1.3.2');
+ google.load('jqueryui', '1.7');
+ </script>
+ <?else:?>
+ <script type="text/javascript" charset="utf-8" src="/javascripts/jquery/jquery.1.2.6.js"></script>
+ <script type="text/javascript" charset="utf-8" src="/javascripts/jquery/jquery-ui-1.7.1.custom.min.js"></script>
+ <?endif?>
+
+ <script type="text/javascript" charset="utf-8" src="/javascripts/build/wildfire_filesystem.min.js"></script>
+ <link href="/stylesheets/cms/wildfire.combined.css" media="screen" rel="Stylesheet" type="text/css" />
+ <link href="/stylesheets/cms/cms-overrides.css" media="screen" rel="Stylesheet" type="text/css" />
+ <!--[if lt IE 7]>
+ <link href="/stylesheets/cms/ie_cms.css" media="screen" rel="Stylesheet" type="text/css" />
+ <![endif]-->
+ <!--[if IE 7]>
+ <link href="/stylesheets/cms/ie7_cms.css" media="screen" rel="Stylesheet" type="text/css" />
+ <![endif]-->
- <?=stylesheet_asset('cms','wildfire.combined.min')?>
- <?=stylesheet_asset('cms','cms-overrides')?>
<title>Content Management System</title>
</head>
@@ -16,7 +33,7 @@
<div id="cms_logo"><a href="/admin/home"><img src="/images/cms/cms_wildfire-logo.gif" /></a></div>
<div id="logout_button"><a href="/admin/home/logout" id="logout"><img src="/images/cms/logout_button.png"></a></div>
<ul id="primary-navigation" class="clearfix">
- <?foreach($all_modules as $name=>$values):?>
+ <?foreach($menu_modules as $name=>$values):?>
<li<?if($name == $module_name) echo " class='active'";?>>
<a href="<?=$values['link']?>">
<?=$values['display_name']?>
view/layouts/file.html
@@ -1,6 +1,6 @@
<div id="link_dialog">
<h3>1. Enter an internet url</h3>
- <p><a href="javascript:void(0)" id="insert_web_url">Click Here</a></p>
+ <p><a href="javascript:void(0)" class="insert_web_url">Click Here</a></p>
<?if(count($all_links)):?>
<h3>2. Link to one of your files</h3>
<p>
@@ -9,7 +9,7 @@
<?foreach($all_links as $link):?>
<option value="<?=$link->url?>"><?=$link->filename?></option>
<?endforeach?>
- </select> <button id="insert_local_url">Insert</button>
+ </select> <button class="insert_local_url">Insert</button>
</p>
<?endif?>
</div>
\ No newline at end of file
view/shared/_apply_links.html
@@ -19,6 +19,7 @@
<div class="image_place">
<img src="<?=$attached_images[$i]->permalink(135)?>" title="<?=$attached_images[$i]->filename?>" alt="<?=$attached_images[$i]->description?>"/>
</div>
+ <p><?=$attached_images[$i]->filename?></p>
<div class="remove_image" id="delete_image_<?=$id?>">
<a href="#">Remove</a>
</div>
view/shared/_page_images.html
resources/public/javascripts/build/jquery.126.files.js
resources/public/javascripts/build/jquery.126.files.min.js
resources/public/javascripts/build/jquery.132.combined.js
resources/public/javascripts/build/jquery.132.combined.min.js
resources/public/stylesheets/cms/wildfire.combined.min.css
5ce06d9d91216781ae14bf790ce9df2f9d6067fd
ec3f922a4a2e8b6f2710c6318a035b8b361051cd
Ross Riley
ross@oneblackbear.com
http://github.com/phpwax/wildfire/commit/14a94d262a89f8b9f479c45d30679babe4e99d6e
14a94d262a89f8b9f479c45d30679babe4e99d6e
2009-10-06T08:31:46-07:00
2009-10-06T08:31:46-07:00
Merge branch 'v3' of git@github.com:phpwax/wildfire into v3
Conflicts:
lib/controller/CMSAdminSectionController.php
resources/public/javascripts/build/jquery.132.combined.js
resources/public/javascripts/build/jquery.132.combined.min.js
resources/public/stylesheets/cms/wildfire.combined.min.css
37b0b153dbba2e4795a0486b4a81f70a1475f403
Ross Riley
ross@oneblackbear.com