~$host~ Admin Control Panel

- - - -

Email Templates

- -

Click one to edit:

- - - - - - - - - - - - -

Template Title	Email Subject
~title html~(blank)	~subject html~(blank)

- - + +

Edit email template "~title html~"

+ +

~description htmlbrtab~

+ +

Notes

This is here just for admins to save any kind of notes (for example clarifications on when/how this email template is used, or notes on what the template was like previously.)

+ +

"From:" email address (required)

When this email template is used, the email generated will be sent from this address.

To supply a name also, use this exact format: John Smith <john@example.com>

+ + +

"To:" email address (required)

When this email template is used, the email generated will sent to this address.

To supply a name also, use this exact format: John Smith <john@example.com>

+ + +

"Cc:" email address (optional)

To supply a name also, use this exact format: John Smith <john@example.com>

+ +

"Bcc:" email address (optional)

To supply a name also, use this exact format: John Smith <john@example.com>

+ +

Template Variables

Variable	Description
~~~~	Puts a single ~~ in the email. You must do this if you want a ~~ in your email.
~~~0~~~	~1~

+ +

Subject

This field uses template variables, see above.

+ +

Message Body

This field uses template variables, see above.

+ +

+ + +

+ +

+ + + +

Email Templates

+ +

Click one to edit:

+ + + + + + + + + + + + +

Template Title	Email Subject
~title html~(blank)	~subject html~(blank)

+ + diff --git a/admin_email_templates.php b/admin_email_templates.php index 10ed922..4ca36a4 100644 --- a/admin_email_templates.php +++ b/admin_email_templates.php @@ -6,21 +6,21 @@ # # in config.php you'll need something like this: # -# $GLOBALS['email_templates'] = [ -# 'slug' => [ -# 'title' => "Title shown in admin only", -# 'description' => "explain (for admins) what this template is for", -# 'variables' => [ -# ['name', "explan (for admins) what this variable is for"], -# ['verbing', "admins can put these variables into the template"] -# ], -# 'subject' => "email subject", -# 'content' => "Hi, ~name~ this is the email body, thanks for ~verbing~!", -# 'from_addr' => 'noreply@airservices.info', -# 'to_addr' => 'optional@to.address' # optional -# ] -# # , 'slug2' => ... -# ]; +# $GLOBALS['email_templates'] = [ +# 'slug' => [ +# 'title' => "Title shown in admin only", +# 'description' => "explain (for admins) what this template is for", +# 'variables' => [ +# ['name', "explan (for admins) what this variable is for"], +# ['verbing', "admins can put these variables into the template"] +# ], +# 'subject' => "email subject", +# 'content' => "Hi, ~name~ this is the email body, thanks for ~verbing~!", +# 'from_addr' => 'noreply@airservices.info', +# 'to_addr' => 'optional@to.address' # optional +# ] +# # , 'slug2' => ... +# ]; # To save results to a database, you'll need to create the email_templates table. # The file admin_email_templates.sql should help with this @@ -30,157 +30,157 @@ define('ADMIN_EMAIL_TEMPLATES_DB_FIELDS', 'slug,notes,from_addr,to_addr,cc_addr, $GLOBALS['admin_email_templates_field_to_caption'] = array( - 'slug' => 'Slug', - 'notes' => 'Notes', - 'from_addr' => 'From Address', - 'to_addr' => 'To Address', - 'cc_addr' => 'Cc Address', - 'bcc_addr' => 'Bcc Address', - 'subject' => 'Subject', - 'content' => 'Content' + 'slug' => 'Slug', + 'notes' => 'Notes', + 'from_addr' => 'From Address', + 'to_addr' => 'To Address', + 'cc_addr' => 'Cc Address', + 'bcc_addr' => 'Bcc Address', + 'subject' => 'Subject', + 'content' => 'Content' ); function admin_email_templates_get_fields() { - $data = array(); - - # slug is cut in *_main() - $data['notes'] = format_unix(_REQUEST_cut('notes')); - $data['to_addr'] = format_email(trim(_REQUEST_cut('to_addr'))); - $data['from_addr'] = format_email(trim(_REQUEST_cut('from_addr'))); - $data['cc_addr'] = format_email(trim(_REQUEST_cut('cc_addr'))); - $data['bcc_addr'] = format_email(trim(_REQUEST_cut('bcc_addr'))); - $data['subject'] = format_oneline(trim(_REQUEST_cut('subject'))); - $data['content'] = format_unix(_REQUEST_cut('content')); - - return $data; + $data = array(); + + # slug is cut in *_main() + $data['notes'] = format_unix(_REQUEST_cut('notes')); + $data['to_addr'] = format_email(trim(_REQUEST_cut('to_addr'))); + $data['from_addr'] = format_email(trim(_REQUEST_cut('from_addr'))); + $data['cc_addr'] = format_email(trim(_REQUEST_cut('cc_addr'))); + $data['bcc_addr'] = format_email(trim(_REQUEST_cut('bcc_addr'))); + $data['subject'] = format_oneline(trim(_REQUEST_cut('subject'))); + $data['content'] = format_unix(_REQUEST_cut('content')); + + return $data; } function admin_email_templates_main() { - session_auth_must('admin_email_templates'); + session_auth_must('admin_email_templates'); - $slug = _REQUEST_cut('slug'); - if ($slug && isset($GLOBALS['email_templates'][$slug])) { - return admin_email_templates_main_form($slug); - } + $slug = _REQUEST_cut('slug'); + if ($slug && isset($GLOBALS['email_templates'][$slug])) { + return admin_email_templates_main_form($slug); + } - # default action: - return admin_email_templates_main_listing(); + # default action: + return admin_email_templates_main_listing(); } function admin_email_templates_main_sort_title($a, $b) { - return strcasecmp($a['title'], $b['title']); + return strcasecmp($a['title'], $b['title']); } function admin_email_templates_main_sort_title_reverse($a, $b) { - return strcasecmp($b['title'], $a['title']); + return strcasecmp($b['title'], $a['title']); } function admin_email_templates_main_sort_subject($a, $b) { - return strcasecmp($a['subject'], $b['subject']); + return strcasecmp($a['subject'], $b['subject']); } function admin_email_templates_main_sort_subject_reverse($a, $b) { - return strcasecmp($b['subject'], $a['subject']); + return strcasecmp($b['subject'], $a['subject']); } function admin_email_templates_main_listing() { - $data = array(); - $reverse = ''; - $sort = _REQUEST_cut('sort'); - if ($sort && substr($sort, 0, 1) === '-') { - $sort = substr($sort, 1); - $reverse = "_reverse"; - } else { - $data["sorting-by-$sort"] = '-'; - } - $legal_sorts = array('title', 'subject'); - if (!$sort || !in_array($sort, $legal_sorts)) { - $sort = 'title'; - } - - $data['rows'] = array(); - - $rows = db_get_assocs('email_templates', 'slug,from_addr,cc_addr,bcc_addr,subject'); - $by_slug = array(); - foreach ($rows as $row) { - $by_slug[$row['slug']] = $row; - } - foreach ($GLOBALS['email_templates'] as $slug => $row) { - $out = array('slug' => $slug); - # defaults from config - foreach($row as $k => $v) { - $out[$k] = $v; - } - # overwrite with db (if it's in the db) - if ($by_slug[$slug]) { - foreach($by_slug[$slug] as $k => $v) { - $out[$k] = $v; - } - } - $data['rows'][] = $out; - } - - usort($data['rows'], "admin_email_templates_main_sort_$sort$reverse"); - - tem_set('listings', $data); + $data = array(); + $reverse = ''; + $sort = _REQUEST_cut('sort'); + if ($sort && substr($sort, 0, 1) === '-') { + $sort = substr($sort, 1); + $reverse = "_reverse"; + } else { + $data["sorting-by-$sort"] = '-'; + } + $legal_sorts = array('title', 'subject'); + if (!$sort || !in_array($sort, $legal_sorts)) { + $sort = 'title'; + } + + $data['rows'] = array(); + + $rows = db_get_assocs('email_templates', 'slug,from_addr,cc_addr,bcc_addr,subject'); + $by_slug = array(); + foreach ($rows as $row) { + $by_slug[$row['slug']] = $row; + } + foreach ($GLOBALS['email_templates'] as $slug => $row) { + $out = array('slug' => $slug); + # defaults from config + foreach($row as $k => $v) { + $out[$k] = $v; + } + # overwrite with db (if it's in the db) + if ($by_slug[$slug]) { + foreach($by_slug[$slug] as $k => $v) { + $out[$k] = $v; + } + } + $data['rows'][] = $out; + } + + usort($data['rows'], "admin_email_templates_main_sort_$sort$reverse"); + + tem_set('listings', $data); } function admin_email_templates_main_form($slug) { - if (isset($_POST['subject'])) { - $data = admin_email_templates_get_fields(); - $data['slug'] = $slug; - - $all_good = true; - $email_fields = ['from', 'to', 'cc', 'bcc']; - foreach ($email_fields as &$field) { - $value = $data[$field . '_addr']; - if (strlen($value)) { - if (!email_header($value)) { - $pretty = ucfirst($field) . ':'; - message("ERROR: invalid value in \"$pretty\" field. Be very careful with formatting, and only put one address in this field."); - $all_good = false; - } - } - } unset($field); - - if (strlen($data['from_addr']) == 0) { - message("ERROR: the \"From:\" field is required."); - $all_good = false; - } - - if (strlen($data['to_addr']) == 0 && isset($GLOBALS['email_templates'][$slug]['to_addr'])) { - message("ERROR: the \"To:\" field is required for this template."); - $all_good = false; - } - if ($all_good) { - if (0 < db_count('email_templates', 'where slug=%"', $slug)) { - db_update_assoc('email_templates', $data, 'where slug=%"', $slug); - } else { - db_insert_assoc('email_templates', $data); - } - message('Email template updated.'); - if ($error !== true) { - return './admin_email_templates'; - } - } else { - $custom = $data; - } - } else { - $custom = db_get_assoc('email_templates', ADMIN_EMAIL_TEMPLATES_DB_FIELDS, 'where slug=%"', $slug); - } - - $out = array('slug' => $slug); - # defaults from globals - foreach($GLOBALS['email_templates'][$slug] as $k => $v) { - $out[$k] = $v; - } - # show 'to_addr' field if it's relevant - if (isset($out['to_addr'])) { - $out['want_to_addr'] = true; - } - # override with db values - if ($custom) { - foreach($custom as $k => $v) { - $out[$k] = $v; - } - } - tem_set('form', $out); + if (isset($_POST['subject'])) { + $data = admin_email_templates_get_fields(); + $data['slug'] = $slug; + + $all_good = true; + $email_fields = ['from', 'to', 'cc', 'bcc']; + foreach ($email_fields as &$field) { + $value = $data[$field . '_addr']; + if (strlen($value)) { + if (!email_header($value)) { + $pretty = ucfirst($field) . ':'; + message("ERROR: invalid value in \"$pretty\" field. Be very careful with formatting, and only put one address in this field."); + $all_good = false; + } + } + } unset($field); + + if (strlen($data['from_addr']) == 0) { + message("ERROR: the \"From:\" field is required."); + $all_good = false; + } + + if (strlen($data['to_addr']) == 0 && isset($GLOBALS['email_templates'][$slug]['to_addr'])) { + message("ERROR: the \"To:\" field is required for this template."); + $all_good = false; + } + if ($all_good) { + if (0 < db_count('email_templates', 'where slug=%"', $slug)) { + db_update_assoc('email_templates', $data, 'where slug=%"', $slug); + } else { + db_insert_assoc('email_templates', $data); + } + message('Email template updated.'); + if ($error !== true) { + return './admin_email_templates'; + } + } else { + $custom = $data; + } + } else { + $custom = db_get_assoc('email_templates', ADMIN_EMAIL_TEMPLATES_DB_FIELDS, 'where slug=%"', $slug); + } + + $out = array('slug' => $slug); + # defaults from globals + foreach($GLOBALS['email_templates'][$slug] as $k => $v) { + $out[$k] = $v; + } + # show 'to_addr' field if it's relevant + if (isset($out['to_addr'])) { + $out['want_to_addr'] = true; + } + # override with db values + if ($custom) { + foreach($custom as $k => $v) { + $out[$k] = $v; + } + } + tem_set('form', $out); } diff --git a/admin_files.html b/admin_files.html index 9074a6e..bec7918 100644 --- a/admin_files.html +++ b/admin_files.html @@ -2,70 +2,70 @@ - ~$host~ Admin: Manage files + ~$host~ Admin: Manage files - -

~$host~ Admin Control Panel

+ +

~$host~ Admin Control Panel

Add a new downloadable fileEdit downloadable file "~description html~"

- + -

- +

+ - -

~$host~ Admin Control Panel

Manage downloadable Files

+ +

~$host~ Admin Control Panel

Manage downloadable Files

To create a download link on your website:

Use the "Add a new file" link below to upload a file, then come back to this page.
Select the value in the "Path" column below and copy it to the clipboard.
Open the page editor for the page where you'd like the download link to appear. (Open the editor in another tab/window so you can still refer to these instructions.)
In the page editor, type the text you'd like people to click on to download the file, then select this text and click the "link" button in the editor (it looks like a globe and a chain).
Paste the "Path" (that you copied earlier from below) into the "URL" field, and set the "Protocol" field to "<other>". Click OK to close the link dialog.
Click "Save" at the bottom of the editor page.
Test your download link by clicking on it.

To create a download link on your website:

Use the "Add a new file" link below to upload a file, then come back to this page.
Select the value in the "Path" column below and copy it to the clipboard.
Open the page editor for the page where you'd like the download link to appear. (Open the editor in another tab/window so you can still refer to these instructions.)
In the page editor, type the text you'd like people to click on to download the file, then select this text and click the "link" button in the editor (it looks like a globe and a chain).
Paste the "Path" (that you copied earlier from below) into the "URL" field, and set the "Protocol" field to "<other>". Click OK to close the link dialog.
Click "Save" at the bottom of the editor page.
Test your download link by clicking on it.

[Add a new file]

- - - - - - - - - + +

	Path	Description
download	~filename html~(file missing)	~description html~(blank)	[delete this file]

+ + + + + + + -

	Path	Description
download	~filename html~(file missing)	~description html~(blank)	[delete this file]

- - -

No downloadable files in database.

- + + + +

No downloadable files in database.

+ -

[Add a new file]

- +

[Add a new file]

+ diff --git a/admin_files.php b/admin_files.php index d32b14d..4b6ae04 100644 --- a/admin_files.php +++ b/admin_files.php @@ -17,112 +17,112 @@ require_once(__DIR__.'/'.'inc/wfpl/email.php'); require_once(__DIR__.'/'.'inc/wfpl/upload.php'); function admin_files_get_fields() { - $data = array(); - - $data['description'] = format_oneline(_REQUEST_cut('description')); - - #header('Content-Type: text/plain'); - #print_r(array($_REQUEST['filename'], $_FILES['filename'])); - #exit(); - $filename_filename_tmp = format_filename($_FILES['filename']['name'], true); - if(!$filename_filename_tmp) { - $filename_filename_tmp = $GLOBALS['filename_file_name']; - } - if($_FILES['filename'] && $_FILES['filename']['error'] == 0) { - $data['filename'] = save_uploaded_file('filename', $GLOBALS['upload_directory'] . $filename_filename_tmp); - } else { - if(_REQUEST_cut('delete_filename') == 'Yes') { - $data['filename'] = ''; - } else { - $data['filename'] = format_path(_REQUEST_cut('old_filename'), true); - } - } - unset($_FILES['filename']); - - return $data; + $data = array(); + + $data['description'] = format_oneline(_REQUEST_cut('description')); + + #header('Content-Type: text/plain'); + #print_r(array($_REQUEST['filename'], $_FILES['filename'])); + #exit(); + $filename_filename_tmp = format_filename($_FILES['filename']['name'], true); + if(!$filename_filename_tmp) { + $filename_filename_tmp = $GLOBALS['filename_file_name']; + } + if($_FILES['filename'] && $_FILES['filename']['error'] == 0) { + $data['filename'] = save_uploaded_file('filename', $GLOBALS['upload_directory'] . $filename_filename_tmp); + } else { + if(_REQUEST_cut('delete_filename') == 'Yes') { + $data['filename'] = ''; + } else { + $data['filename'] = format_path(_REQUEST_cut('old_filename'), true); + } + } + unset($_FILES['filename']); + + return $data; } function admin_files_main() { - session_auth_must('admin_files'); + session_auth_must('admin_files'); - $id = _REQUEST_cut('edit_id'); - if($id) { - return admin_files_main_form($id); - } + $id = _REQUEST_cut('edit_id'); + if($id) { + return admin_files_main_form($id); + } - $id = _REQUEST_cut('admin_files_delete_id'); - if($id) { - return admin_files_main_delete($id); - } + $id = _REQUEST_cut('admin_files_delete_id'); + if($id) { + return admin_files_main_delete($id); + } - if(_REQUEST_cut('new')) { - return admin_files_main_form(); - } + if(_REQUEST_cut('new')) { + return admin_files_main_form(); + } - if(_REQUEST_cut('list')) { - return admin_files_main_listing(); - } + if(_REQUEST_cut('list')) { + return admin_files_main_listing(); + } - if(isset($_POST['description'])) { - return admin_files_main_form(); - } + if(isset($_POST['description'])) { + return admin_files_main_form(); + } - # default action: - return admin_files_main_listing(); + # default action: + return admin_files_main_listing(); } function admin_files_main_delete($id) { - $fn = db_get_value('files', 'filename', 'where id=%i', $id); - if ($fn) { - unlink($fn); - db_delete('files', 'where id=%i', $id); - message('File deleted.'); - } else { - message("Couldn't find file to delete. Maybe it's already been deleted?"); - } - return './admin_files'; + $fn = db_get_value('files', 'filename', 'where id=%i', $id); + if ($fn) { + unlink($fn); + db_delete('files', 'where id=%i', $id); + message('File deleted.'); + } else { + message("Couldn't find file to delete. Maybe it's already been deleted?"); + } + return './admin_files'; } function admin_files_main_listing() { - $listing_rows = db_get_assocs('files', 'id,filename,description', 'order by coalesce(nullif(description, ""), substring(filename, 7)) limit 100'); - tem_set('listings', $listing_rows); + $listing_rows = db_get_assocs('files', 'id,filename,description', 'order by coalesce(nullif(description, ""), substring(filename, 7)) limit 100'); + tem_set('listings', $listing_rows); } function admin_files_main_form($id = false) { - if($id) { - tem_set('id', $id); - } - - if(isset($_POST['description'])) { - $data = admin_files_get_fields(); - - if("you're happy with the POSTed values") { - if($id) { - db_update_assoc('files', $data, 'where id=%i', $id); - message('File updated.'); - } else { - db_insert_assoc('files', $data); - message('File saved.'); - } - if($error !== true) { - return './admin_files'; - } - } - # otherwise, we display the form again. admin_files_get_fields() has - # already put the posted values back into the template engine, so they will - # show up in the form fields. You should add some message asking people to - # fix their entry in whatever way you require. - } elseif($id) { - # we've recieved an edit id, but no data. So we grab the values to be edited from the database - $data = db_get_assoc('files', ADMIN_FILES_DB_FIELDS, 'where id=%i', $id); - } else { - # form not submitted, you can set default values like so: - #$data = array('description' => 'Yes'); - $data = array(); - } - - tem_set('upload_max_filesize', upload_max_filesize()); - - tem_set('form', $data); + if($id) { + tem_set('id', $id); + } + + if(isset($_POST['description'])) { + $data = admin_files_get_fields(); + + if("you're happy with the POSTed values") { + if($id) { + db_update_assoc('files', $data, 'where id=%i', $id); + message('File updated.'); + } else { + db_insert_assoc('files', $data); + message('File saved.'); + } + if($error !== true) { + return './admin_files'; + } + } + # otherwise, we display the form again. admin_files_get_fields() has + # already put the posted values back into the template engine, so they will + # show up in the form fields. You should add some message asking people to + # fix their entry in whatever way you require. + } elseif($id) { + # we've recieved an edit id, but no data. So we grab the values to be edited from the database + $data = db_get_assoc('files', ADMIN_FILES_DB_FIELDS, 'where id=%i', $id); + } else { + # form not submitted, you can set default values like so: + #$data = array('description' => 'Yes'); + $data = array(); + } + + tem_set('upload_max_filesize', upload_max_filesize()); + + tem_set('form', $data); } diff --git a/admin_header.html b/admin_header.html index b74de64..fad2ee0 100644 --- a/admin_header.html +++ b/admin_header.html @@ -1,34 +1,34 @@ - - ~$host~ Admin: Header Image + + ~$host~ Admin: Header Image - -

~$host~ Admin: Set header image for home page

+ +

~$host~ Admin: Set header image for home page

+ -

Width (in pixels)

Your image will be automatically resized to be this wide. ~width_max~ is the full width of the available space.

Width (in pixels)

Your image will be automatically resized to be this wide. ~width_max~ is the full width of the available space.

Image

Please upload an image that is at least the width you specified above.

Image

Please upload an image that is at least the width you specified above.

Caption (optional)

If specified, this will overlay the bottom/right corner of the header image.

Caption (optional)

If specified, this will overlay the bottom/right corner of the header image.

- + + diff --git a/admin_header.php b/admin_header.php index 66430ad..f05640b 100644 --- a/admin_header.php +++ b/admin_header.php @@ -6,67 +6,67 @@ $GLOBALS['upload_directory'] = 'image/'; function admin_header_get_fields() { - $data = array(); + $data = array(); - $data['width'] = (int) format_int_0(_REQUEST_cut('width')); - $data['caption'] = format_oneline(_REQUEST_cut('caption')); + $data['width'] = (int) format_int_0(_REQUEST_cut('width')); + $data['caption'] = format_oneline(_REQUEST_cut('caption')); - if ($data['width'] < 100 || $data['width'] > WFPL_SITE_WIDTH) { - $data['width'] = WFPL_SITE_WIDTH; - } + if ($data['width'] < 100 || $data['width'] > WFPL_SITE_WIDTH) { + $data['width'] = WFPL_SITE_WIDTH; + } - $old = persistent_get('wfplcms_header_image'); - if ($_FILES['image'] && $_FILES['image']['error'] == 0) { - if ($old) { - $data['version'] = 1 + $old['version']; - } else { - $data['version'] = 1; - } - $ext = generate_filename($_FILES['image']['name'], $_FILES['image']['type']); - $ext = substr($ext, strrpos($ext, '.') + 1); - $ext = strtolower($ext); - if ($ext !== 'jpg' && $ext !== 'jpeg') { - $ext = 'png'; - } - $dest = "{$GLOBALS['upload_directory']}header_v{$data['version']}.$ext"; - $image = convert_uploaded_image('image', $dest, $data['width'], 2000); - # FIXME use autoresizer instead, and call identify to get aspect ratio - $image = explode(' ', $image); - $data['url'] = $image[0]; - $data['width'] = $image[1]; - $data['height'] = $image[2]; - } else if ($old) { - $data['url'] = $old['url']; - if ($data['width'] == $old['width']) { - $data['height'] = $old['height']; - } else { - $data['height'] = $old['height'] / $old['width'] * $data['width']; - } - } - unset($_FILES['image']); + $old = persistent_get('wfplcms_header_image'); + if ($_FILES['image'] && $_FILES['image']['error'] == 0) { + if ($old) { + $data['version'] = 1 + $old['version']; + } else { + $data['version'] = 1; + } + $ext = generate_filename($_FILES['image']['name'], $_FILES['image']['type']); + $ext = substr($ext, strrpos($ext, '.') + 1); + $ext = strtolower($ext); + if ($ext !== 'jpg' && $ext !== 'jpeg') { + $ext = 'png'; + } + $dest = "{$GLOBALS['upload_directory']}header_v{$data['version']}.$ext"; + $image = convert_uploaded_image('image', $dest, $data['width'], 2000); + # FIXME use autoresizer instead, and call identify to get aspect ratio + $image = explode(' ', $image); + $data['url'] = $image[0]; + $data['width'] = $image[1]; + $data['height'] = $image[2]; + } else if ($old) { + $data['url'] = $old['url']; + if ($data['width'] == $old['width']) { + $data['height'] = $old['height']; + } else { + $data['height'] = $old['height'] / $old['width'] * $data['width']; + } + } + unset($_FILES['image']); - return $data; + return $data; } function admin_header_main() { - session_auth_must('admin_header'); + session_auth_must('admin_header'); - if (isset($_REQUEST['width'])) { - $data = admin_header_get_fields(); - if (isset($data['url'])) { - persistent_set('wfplcms_header_image', $data); - message('Header image updated'); - return './admin_header'; - } - } else { - $data = persistent_get('wfplcms_header_image'); - if (!$data) { - $data = array('width' => ''); - } - } + if (isset($_REQUEST['width'])) { + $data = admin_header_get_fields(); + if (isset($data['url'])) { + persistent_set('wfplcms_header_image', $data); + message('Header image updated'); + return './admin_header'; + } + } else { + $data = persistent_get('wfplcms_header_image'); + if (!$data) { + $data = array('width' => ''); + } + } - tem_set('width_max', WFPL_SITE_WIDTH); + tem_set('width_max', WFPL_SITE_WIDTH); - tem_set('form', $data); + tem_set('form', $data); } \ No newline at end of file diff --git a/admin_images.html b/admin_images.html index 9633384..fa3dc93 100644 --- a/admin_images.html +++ b/admin_images.html @@ -2,71 +2,71 @@ - ~$host~ Admin: Manage Images + ~$host~ Admin: Manage Images - -

~$host~ Admin Control Panel

- -

Add a new imageEdit image "~name html~"

- - - -

- - - -

~$host~ Admin Control Panel

- -

Manage Images

- - -

- - - - - - - - - - - - -

- [sort by age] [sort by name/caption] [sort by caption/name] -
	Name: ~name html~ Caption: ~caption html~	[edit]	[delete]

- - -

No images in database.

- - -

- + +

~$host~ Admin Control Panel

+ +

Add a new imageEdit image "~name html~"

+ + + +

+ + + +

~$host~ Admin Control Panel

+ +

Manage Images

+ + +

+ + + + + + + + + + + + +

+ [sort by age] [sort by name/caption] [sort by caption/name] +
	Name: ~name html~ Caption: ~caption html~	[edit]	[delete]

+ + +

No images in database.

+ + +

View archived versions of this page

+ diff --git a/admin_images.php b/admin_images.php index 443aae9..c2f4943 100644 --- a/admin_images.php +++ b/admin_images.php @@ -9,150 +9,150 @@ require_once(__DIR__.'/'.'inc/wfpl/upload.php'); # example: 200x300 function format_width_height($str) { - $fields = explode('x', $str); - if(count($fields) != 2) { - return ''; - } + $fields = explode('x', $str); + if(count($fields) != 2) { + return ''; + } - list($width, $height) = $fields; - $width = format_int_0($width); - $height = format_int_0($height); + list($width, $height) = $fields; + $width = format_int_0($width); + $height = format_int_0($height); - return "${width}x$height"; + return "${width}x$height"; } function admin_images_get_fields() { - $data = array(); - - $data['name'] = format_oneline(_REQUEST_cut('name')); - $data['caption'] = format_oneline(_REQUEST_cut('caption')); - - if($_FILES['image'] && $_FILES['image']['error'] == 0 && file_exists($_FILES['image']['tmp_name'])) { - $image_fn_ext = path_or_mime_to_ext($_FILES['image']['name'], $_FILES['image']['type']); - $image_fn_ext = ext_to_web_image_ext($image_fn_ext); - $image_fn_base = sha1_file($_FILES['image']['tmp_name']); - if (strlen($image_fn_base) == 40) { - $image_fn_base = substr($image_fn_base, 0, 16); - $image_filename = 'cms_images/' . $image_fn_base . '.' . $image_fn_ext; - $data['image'] = convert_uploaded_image('image', $image_filename); - } - } else { - if(_REQUEST_cut('delete_image') == 'Yes') { - $data['image'] = ''; - } - } - unset($_FILES['image']); - - return $data; + $data = array(); + + $data['name'] = format_oneline(_REQUEST_cut('name')); + $data['caption'] = format_oneline(_REQUEST_cut('caption')); + + if($_FILES['image'] && $_FILES['image']['error'] == 0 && file_exists($_FILES['image']['tmp_name'])) { + $image_fn_ext = path_or_mime_to_ext($_FILES['image']['name'], $_FILES['image']['type']); + $image_fn_ext = ext_to_web_image_ext($image_fn_ext); + $image_fn_base = sha1_file($_FILES['image']['tmp_name']); + if (strlen($image_fn_base) == 40) { + $image_fn_base = substr($image_fn_base, 0, 16); + $image_filename = 'cms_images/' . $image_fn_base . '.' . $image_fn_ext; + $data['image'] = convert_uploaded_image('image', $image_filename); + } + } else { + if(_REQUEST_cut('delete_image') == 'Yes') { + $data['image'] = ''; + } + } + unset($_FILES['image']); + + return $data; } function admin_images_main() { - session_auth_must('admin_images'); + session_auth_must('admin_images'); - $id = _REQUEST_cut('edit_id'); - if($id) { - return admin_images_main_form($id); - } + $id = _REQUEST_cut('edit_id'); + if($id) { + return admin_images_main_form($id); + } - $id = _REQUEST_cut('admin_images_delete_id'); - if($id) { - return admin_images_main_delete($id); - } + $id = _REQUEST_cut('admin_images_delete_id'); + if($id) { + return admin_images_main_delete($id); + } - if(_REQUEST_cut('new')) { - return admin_images_main_form(); - } + if(_REQUEST_cut('new')) { + return admin_images_main_form(); + } - if(_REQUEST_cut('list')) { - return admin_images_main_listing(); - } + if(_REQUEST_cut('list')) { + return admin_images_main_listing(); + } - if(isset($_POST['name'])) { - return admin_images_main_form(); - } + if(isset($_POST['name'])) { + return admin_images_main_form(); + } - # default action: - return admin_images_main_listing(); + # default action: + return admin_images_main_listing(); } function admin_images_main_delete($id) { - $data = db_get_assoc('cms_images', 'image', 'where id=%i', $id); - if ($data) { - $src = enc_image_src($data['image']); - if ($src) { - $filenames = array($src); - foreach ($GLOBALS['wfpl_image_widths'] as $w) { - $filenames [] = substr($src, 0, -4) . 'w' . $w . substr($src, -4); - } - foreach ($filenames as $filename) { - if (file_exists($filename)) { - unlink($filename); - } - } - } - db_delete('cms_images', 'where id=%i', $id); - message('Image deleted.'); - } else { - message("Couldn't find image to delete. Maybe it's already been deleted?"); - } - return './admin_images'; + $data = db_get_assoc('cms_images', 'image', 'where id=%i', $id); + if ($data) { + $src = enc_image_src($data['image']); + if ($src) { + $filenames = array($src); + foreach ($GLOBALS['wfpl_image_widths'] as $w) { + $filenames [] = substr($src, 0, -4) . 'w' . $w . substr($src, -4); + } + foreach ($filenames as $filename) { + if (file_exists($filename)) { + unlink($filename); + } + } + } + db_delete('cms_images', 'where id=%i', $id); + message('Image deleted.'); + } else { + message("Couldn't find image to delete. Maybe it's already been deleted?"); + } + return './admin_images'; } function admin_images_main_listing() { - $sort_by = 'name'; - $sorts = array( - 'age' => 'created_at desc', - 'name' => "coalesce(nullif(name, ''), caption), created_at", - 'caption' => "coalesce(nullif(caption, ''), name), created_at" - ); - if (isset($_REQUEST['sort'])) { - foreach ($sorts as $s => $sql) { - if ($_REQUEST['sort'] == $s) { - $sort_by = $s; - break; - } - } - } - tem_set("sort_by_$sort_by"); - $listing_rows = db_get_assocs('cms_images', 'id,image,name,caption', 'order by ' . $sorts[$sort_by]); - tem_set('listings', $listing_rows); + $sort_by = 'name'; + $sorts = array( + 'age' => 'created_at desc', + 'name' => "coalesce(nullif(name, ''), caption), created_at", + 'caption' => "coalesce(nullif(caption, ''), name), created_at" + ); + if (isset($_REQUEST['sort'])) { + foreach ($sorts as $s => $sql) { + if ($_REQUEST['sort'] == $s) { + $sort_by = $s; + break; + } + } + } + tem_set("sort_by_$sort_by"); + $listing_rows = db_get_assocs('cms_images', 'id,image,name,caption', 'order by ' . $sorts[$sort_by]); + tem_set('listings', $listing_rows); } function admin_images_main_form($id = false) { - if($id) { - tem_set('id', $id); - } - - if(isset($_POST['name'])) { - $data = admin_images_get_fields(); - - # save anything - # Note: If you change this to re-display the form in some cases, be sure to handle image uploads well (don't make them upload it again.) - - # save to database - if($id) { - db_update_assoc('cms_images', $data, 'where id=%i', $id); - message('Image updated.'); - $saved_id = $id; - return "./admin_images"; - } else { - $data['created_at'] = time(); - db_insert_assoc('cms_images', $data); - message('Image saved. Next time you open a page editor, this image will be availble in the "Insert Image" dialog.'); - $saved_id = db_auto_id(); - return "./admin_images?sort=age"; - } - - } elseif($id) { - # we've recieved an edit id, but no data. So we grab the values to be edited from the database - $data = db_get_assoc('cms_images', ADMIN_IMAGES_DB_FIELDS, 'where id=%i', $id); - } else { - # form not submitted, set default values: - $data = array(); - } - - tem_set('upload_max_filesize', upload_max_filesize()); - - tem_set('form', $data); + if($id) { + tem_set('id', $id); + } + + if(isset($_POST['name'])) { + $data = admin_images_get_fields(); + + # save anything + # Note: If you change this to re-display the form in some cases, be sure to handle image uploads well (don't make them upload it again.) + + # save to database + if($id) { + db_update_assoc('cms_images', $data, 'where id=%i', $id); + message('Image updated.'); + $saved_id = $id; + return "./admin_images"; + } else { + $data['created_at'] = time(); + db_insert_assoc('cms_images', $data); + message('Image saved. Next time you open a page editor, this image will be availble in the "Insert Image" dialog.'); + $saved_id = db_auto_id(); + return "./admin_images?sort=age"; + } + + } elseif($id) { + # we've recieved an edit id, but no data. So we grab the values to be edited from the database + $data = db_get_assoc('cms_images', ADMIN_IMAGES_DB_FIELDS, 'where id=%i', $id); + } else { + # form not submitted, set default values: + $data = array(); + } + + tem_set('upload_max_filesize', upload_max_filesize()); + + tem_set('form', $data); } diff --git a/admin_pages.html b/admin_pages.html index 0d5614c..cc23bfc 100644 --- a/admin_pages.html +++ b/admin_pages.html @@ -2,464 +2,464 @@ - ~$host~ Admin: Manage PagesAdd a new pageEdit page "~title html~" - - - - + + - + window.admin_pages_cur_layout = layout + } + + - -

~$host~ Admin Control Panel

+ +

~$host~ Admin Control Panel

Add a new pageEdit page "~title html~"

- -

- + +

View archived versions of this page

+ -

Title

(This appears at the top of the page, in the window title-bar (by the close button) and as the headline/link of search engine results.)

Title

(This appears at the top of the page, in the window title-bar (by the close button) and as the headline/link of search engine results.)

Filename

(Careful: if you change this, be sure to update all links to this pagePlease use only a-z, 0-9 and _ (underscore) in your filename. Please, no capitals, punctuation or spaces.)

Filename

(Careful: if you change this, be sure to update all links to this pagePlease use only a-z, 0-9 and _ (underscore) in your filename. Please, no capitals, punctuation or spaces.)

Show in site-wide navigation links (optional)

Navigation Link Text

(If you'd like this page to appear in the navigation with a shorter title.)

Navigation Link Text

(If you'd like this page to appear in the navigation with a shorter title.)

Page Template/Layout

Page Contents

Please read these instructions in full:
If you don't see an editor below (with buttons in it) then please try this page in Mozilla FireFox or Google Chrome.
If you're pasting from Microsoft Word, please use the "paste from word" button (looks like a clipboard with a "W").
To make a link, type the text to be clicked, select it, click the "Link" button (looks like a short chain) and paste the web address (where the link should point to) into the "URL" field. Exception: If you're making a link to another page on this site, please remove the "http://~$host~/" from the beginning of the "URL" field and set the "Protocol" to <other>.
To insert an image: place the cursor at the beginning of a line and click the "insert image" button in the editor. Note that you will only be able to insert images that you have already uploaded on the manage images page.

Page Contents

Please read these instructions in full:
If you don't see an editor below (with buttons in it) then please try this page in Mozilla FireFox or Google Chrome.
If you're pasting from Microsoft Word, please use the "paste from word" button (looks like a clipboard with a "W").
To make a link, type the text to be clicked, select it, click the "Link" button (looks like a short chain) and paste the web address (where the link should point to) into the "URL" field. Exception: If you're making a link to another page on this site, please remove the "http://~$host~/" from the beginning of the "URL" field and set the "Protocol" to <other>.
To insert an image: place the cursor at the beginning of a line and click the "insert image" button in the editor. Note that you will only be able to insert images that you have already uploaded on the manage images page.

Sidebar Contents

Ditto to the notes above "Page Contents" field.
Centered images appear smaller in this editor than on the real page.
Don't use the "Insert on Left" and "or Insert on Right" options for images inserting images in this sidebar.

Sidebar Contents

Ditto to the notes above "Page Contents" field.
Centered images appear smaller in this editor than on the real page.
Don't use the "Insert on Left" and "or Insert on Right" options for images inserting images in this sidebar.

- + - +

Keywords

(Hidden words (up to 30) with commas between them for search engines)

+ --> -

+ -

- +

+ - -

~$host~ Admin Control Panel

+ +

~$host~ Admin Control Panel

Manage Pages

- - - - - - - - - - - - - - - - +

(new)	- -
(home page)	- - - - -
~title html~(untitled)	- - - -

+ + + + + + + + + + + + + + + -

(new)	+ +
(home page)	+ + + + +
~title html~(untitled)	+ + + +

- - -

~$host~ Admin Control Panel

+ + + +

~$host~ Admin Control Panel

Edit history for page "~title html~"

- -

There are no archived versions of this page.

- - - - - - - - - - - - - - - - - - -

title	saved at	by
~title html~(untitled)	~timestamp~	~who html~	- - - - - - - - - - - -

- - + +

There are no archived versions of this page.

+ + + + + + + + + + + + + + + + + + +

title	saved at	by
~title html~(untitled)	~timestamp~	~who html~	+ + + + + + + + + + + +

+ + diff --git a/admin_pages.php b/admin_pages.php index ae0fa33..384591d 100644 --- a/admin_pages.php +++ b/admin_pages.php @@ -6,264 +6,264 @@ define('ADMIN_PAGES_DB_FIELDS', 'title,filename,navbar,nav_title,layout,content, function format_cms_filename($str) { - $str = format_filename($str); - $str = str_replace('.', '_', $str); - return $str; + $str = format_filename($str); + $str = str_replace('.', '_', $str); + return $str; } function admin_pages_get_fields() { - $data = array(); - - $data['title'] = format_oneline(_REQUEST_cut('title')); - $data['filename'] = format_cms_filename(_REQUEST_cut('filename')); - $data['navbar'] = format_options(_REQUEST_cut('navbar'), 'navbar'); - $data['nav_title'] = format_oneline(_REQUEST_cut('nav_title')); - $data['layout'] = format_options(_REQUEST_cut('layout'), 'layout'); - $data['content'] = format_unix(_REQUEST_cut('content')); - if (isset($_REQUEST['sidebar_content'])) { // probs not needed - $data['sidebar_content'] = format_unix(_REQUEST_cut('sidebar_content')); - } - if (isset($_REQUEST['description'])) { - $data['description'] = format_unix(_REQUEST_cut('description')); - } - if (isset($_REQUEST['keywords'])) { - $data['keywords'] = format_unix(_REQUEST_cut('keywords')); - } - - return $data; + $data = array(); + + $data['title'] = format_oneline(_REQUEST_cut('title')); + $data['filename'] = format_cms_filename(_REQUEST_cut('filename')); + $data['navbar'] = format_options(_REQUEST_cut('navbar'), 'navbar'); + $data['nav_title'] = format_oneline(_REQUEST_cut('nav_title')); + $data['layout'] = format_options(_REQUEST_cut('layout'), 'layout'); + $data['content'] = format_unix(_REQUEST_cut('content')); + if (isset($_REQUEST['sidebar_content'])) { // probs not needed + $data['sidebar_content'] = format_unix(_REQUEST_cut('sidebar_content')); + } + if (isset($_REQUEST['description'])) { + $data['description'] = format_unix(_REQUEST_cut('description')); + } + if (isset($_REQUEST['keywords'])) { + $data['keywords'] = format_unix(_REQUEST_cut('keywords')); + } + + return $data; } function admin_pages_main() { - session_auth_must('admin_pages'); - - $id = _REQUEST_cut('edit_id'); - if($id) { - return admin_pages_main_form($id); - } - - $id = _REQUEST_cut('edit_history_id'); - if($id) { - return admin_pages_main_form(null, $id); - } - - $id = _REQUEST_cut('history_page_id'); - if($id) { - return admin_pages_main_page_history($id); - } - - $id = _REQUEST_cut('history_id'); - if($id) { - return admin_pages_main_history($id); - } - - $id = _REQUEST_cut('admin_pages_delete_id'); - if($id) { - return admin_pages_main_delete($id); - } - - if(_REQUEST_cut('new')) { - return admin_pages_main_form(); - } - - if(_REQUEST_cut('list')) { - return admin_pages_main_listing(); - } - - $id = _REQUEST_cut('id'); - if($id) { - return admin_pages_main_display($id); - } - - if(isset($_POST['title'])) { - return admin_pages_main_form(); - } - - # default action: - return admin_pages_main_listing(); + session_auth_must('admin_pages'); + + $id = _REQUEST_cut('edit_id'); + if($id) { + return admin_pages_main_form($id); + } + + $id = _REQUEST_cut('edit_history_id'); + if($id) { + return admin_pages_main_form(null, $id); + } + + $id = _REQUEST_cut('history_page_id'); + if($id) { + return admin_pages_main_page_history($id); + } + + $id = _REQUEST_cut('history_id'); + if($id) { + return admin_pages_main_history($id); + } + + $id = _REQUEST_cut('admin_pages_delete_id'); + if($id) { + return admin_pages_main_delete($id); + } + + if(_REQUEST_cut('new')) { + return admin_pages_main_form(); + } + + if(_REQUEST_cut('list')) { + return admin_pages_main_listing(); + } + + $id = _REQUEST_cut('id'); + if($id) { + return admin_pages_main_display($id); + } + + if(isset($_POST['title'])) { + return admin_pages_main_form(); + } + + # default action: + return admin_pages_main_listing(); } # admin-only access to view pages with no filename function admin_pages_main_display($id) { - $page = db_get_assoc('cms_pages', 'id,title,keywords,description,layout,content,sidebar_content', 'where id=%"', $id); - cms_display_content($GLOBALS['wfpl_main_template'], $page); - $GLOBALS['wfpl_main_template']->data['$admin_links']['$edit_page_id'] = $id; + $page = db_get_assoc('cms_pages', 'id,title,keywords,description,layout,content,sidebar_content', 'where id=%"', $id); + cms_display_content($GLOBALS['wfpl_main_template'], $page); + $GLOBALS['wfpl_main_template']->data['$admin_links']['$edit_page_id'] = $id; } function admin_pages_main_delete($id) { - db_delete('cms_pages', 'where id=%i', $id); - message('Page deleted.'); - return './admin_pages'; + db_delete('cms_pages', 'where id=%i', $id); + message('Page deleted.'); + return './admin_pages'; } # get all images from admin_images (for cms) function admin_pages_get_images() { - $out = []; - $rows = db_get_assocs('cms_images', 'image,name,caption', "order by coalesce(nullif(name, ''), caption), created_at"); - if ($rows) { - $id = -1; - foreach($rows as &$row) { $id += 1; - $parts = explode(' ', $row['image'] . ' ', 7); - $out[] = [ - 'id' => '' . $id, - 'src' => $parts[0], - 'aspect' => ''.(round(100000 * ((int)$parts[2]) / ((int)$parts[1]) / 1000)).'%', - 'name' => $row['name'], - 'caption' => $row['caption'] - ]; - } unset($row); - } - return $out; + $out = []; + $rows = db_get_assocs('cms_images', 'image,name,caption', "order by coalesce(nullif(name, ''), caption), created_at"); + if ($rows) { + $id = -1; + foreach($rows as &$row) { $id += 1; + $parts = explode(' ', $row['image'] . ' ', 7); + $out[] = [ + 'id' => '' . $id, + 'src' => $parts[0], + 'aspect' => ''.(round(100000 * ((int)$parts[2]) / ((int)$parts[1]) / 1000)).'%', + 'name' => $row['name'], + 'caption' => $row['caption'] + ]; + } unset($row); + } + return $out; } function admin_pages_main_listing() { - $data = array(); - - $rows = db_get_assocs('cms_pages', 'id,coalesce(nullif(nav_title,""), title) as title,filename', 'order by coalesce(nullif(nav_title,""), title), filename limit 2000'); - $have_home_page = false; - if (count($rows) !== 0) { - $data['rows'] = $rows; - foreach ($rows as &$row) { - if ($row['filename'] === 'index') { - $have_home_page = true; - break; - } - } unset($row); - } - if ($have_home_page === false) { - $data['no_home'] = true; - } - tem_set('listing', $data); + $data = array(); + + $rows = db_get_assocs('cms_pages', 'id,coalesce(nullif(nav_title,""), title) as title,filename', 'order by coalesce(nullif(nav_title,""), title), filename limit 2000'); + $have_home_page = false; + if (count($rows) !== 0) { + $data['rows'] = $rows; + foreach ($rows as &$row) { + if ($row['filename'] === 'index') { + $have_home_page = true; + break; + } + } unset($row); + } + if ($have_home_page === false) { + $data['no_home'] = true; + } + tem_set('listing', $data); } function admin_pages_main_page_history ($id) { - $data = array(); - - $rows = db_get_assocs('history_cms_pages left join users on history_cms_pages.history_user_id = users.id', 'history_cms_pages.id as page_id,history_cms_pages.history_id,history_cms_pages.filename,coalesce(nullif(history_cms_pages.nav_title,""), history_cms_pages.title) as title,history_when as timestamp,coalesce(nullif(users.name,""), users.username) as who', 'where history_cms_pages.id=%i order by history_id desc', $id); - if (count($rows) !== 0) { - $data['title'] = $rows[0]['title']; - $rows[0]['first'] = true; - if ($rows[0]['filename'] === 'index') { - $rows[0]['filename'] = './'; - } - $data['rows'] = $rows; - } - tem_set('page_history', $data); + $data = array(); + + $rows = db_get_assocs('history_cms_pages left join users on history_cms_pages.history_user_id = users.id', 'history_cms_pages.id as page_id,history_cms_pages.history_id,history_cms_pages.filename,coalesce(nullif(history_cms_pages.nav_title,""), history_cms_pages.title) as title,history_when as timestamp,coalesce(nullif(users.name,""), users.username) as who', 'where history_cms_pages.id=%i order by history_id desc', $id); + if (count($rows) !== 0) { + $data['title'] = $rows[0]['title']; + $rows[0]['first'] = true; + if ($rows[0]['filename'] === 'index') { + $rows[0]['filename'] = './'; + } + $data['rows'] = $rows; + } + tem_set('page_history', $data); } function admin_pages_main_history ($id) { - $cms_page = db_get_assoc('history_cms_pages', 'id,title,keywords,description,layout,content,sidebar_content', 'where history_id=%"', $id); - if (!$cms_page) { - message("Error 9393 please inform developer"); - return './admin_pages'; - } - message('You are viewing an archived version of this page. To publish this version (revert the page) click the "Edit this page" link at the top, then the "save" at the bottom of the editor page. Feel free to make changes before saving.'); - cms_display_content($GLOBALS['wfpl_main_template'], $cms_page); - $GLOBALS['wfpl_main_template']->data['$admin_links']['$edit_page_id'] = null; - $GLOBALS['wfpl_main_template']->data['$admin_links']['$edit_page_history_id'] = $id; + $cms_page = db_get_assoc('history_cms_pages', 'id,title,keywords,description,layout,content,sidebar_content', 'where history_id=%"', $id); + if (!$cms_page) { + message("Error 9393 please inform developer"); + return './admin_pages'; + } + message('You are viewing an archived version of this page. To publish this version (revert the page) click the "Edit this page" link at the top, then the "save" at the bottom of the editor page. Feel free to make changes before saving.'); + cms_display_content($GLOBALS['wfpl_main_template'], $cms_page); + $GLOBALS['wfpl_main_template']->data['$admin_links']['$edit_page_id'] = null; + $GLOBALS['wfpl_main_template']->data['$admin_links']['$edit_page_history_id'] = $id; } function admin_pages_main_form($id = false, $history_id = false) { - if ($history_id) { - message('The fields below have been filled with an archived version of this page. To publish this version (revert the page) click "save" button at the bottom. Feel free to make changes before saving.'); - $history_data = db_get_assoc('history_cms_pages', 'id,'.ADMIN_PAGES_DB_FIELDS, 'where history_id=%i', $history_id); - if (!$history_data) { - message("Error 3938 please inform developer"); - return './admin_pages'; - } - $id = $history_data['id']; - } elseif ($id) { - if (db_count('history_cms_pages', 'where id=%i', $id) > 1) { - tem_set('archived_versions'); - } - } - if($id) { - tem_set('id', $id); - } - - tem_set('$basename', 'admin_pages'); - - pulldown('layout', [ - ['0', "Full (no sidebar)"], - ['1', "With Plain Sidebar"], - ['2', "With Bordered Sidebar"] - ]); - - $navbar_options = array(array('ignored', 'Not at all'), array('0', 'First')); - $rows = db_get_rows('cms_pages', 'id,coalesce(nullif(nav_title,\'\'), title) as title,navbar', 'where navbar != 0 order by navbar'); - if($rows) for($i = 0; $i < count($rows); ++$i) { - list($other_id, $other_title, $other_ord) = $rows[$i]; - if($other_id != $id) { # don't display ourselves - $navbar_options[] = array($i + 1, "After \"$other_title\""); - } - } - pulldown('navbar', $navbar_options, PULLDOWN_2D); - - if(isset($_POST['title'])) { - $data = admin_pages_get_fields(); - - # We'll save anything (no required fields) - - $data['navbar'] = db_reposition('cms_pages', $id, $data['navbar'], 'navbar', 'page'); - - if($data['navbar'] && $data['filename'] == '') { - message('This page was removed from the navigation column because it does not have a filename. (Pages without filenames are visible only to admins.)'); - $data['navbar'] = 0; - } - - # save - if($id) { - db_update_assoc('cms_pages', $data, 'where id=%i', $id); - message('Page updated.'); - } else { - db_insert_assoc('cms_pages', $data); - $id = db_auto_id(); - message('Page saved.'); - } - - # save to version history - $data['id'] = $id; - $data['history_when'] = time(); - $s = session_auth(); - $data['history_user_id'] = $s['id']; - db_insert_assoc('history_cms_pages', $data); - - # redirect - if ($data['filename'] === 'index') { - return './'; - } elseif($data['filename'] !== '') { - return "./{$data['filename']}"; - } else { - return "./admin_pages?id=$id"; - } - } elseif($id) { - # we've recieved an edit id, but no data. So we grab the values to be edited from the database - if ($history_id) { - $data = $history_data; - } else { - $data = db_get_assoc('cms_pages', ADMIN_PAGES_DB_FIELDS, 'where id=%i', $id); - } - if($data['navbar']) { - $data['navbar'] = db_count('cms_pages', 'where navbar!=0 && navbar<%i', $data['navbar']); - } else { - $data['navbar'] = 'ignored'; - } - } else { - # form not submitted, set default values: - $data = array('filename' => format_cms_filename($_REQUEST['new_filename'])); - } - - if (!isset($data['layout']) || $data['layout'] === '' || $data['layout'] === '0') { - $data['sidebar_editor_display'] = 'none'; - } else { - $data['sidebar_editor_display'] = 'block'; - } - - tem_set('wfpl_images_json', json_encode(admin_pages_get_images())); - tem_set('wfpl_image_width_full', WFPL_IMAGE_WIDTH_FULL); - tem_set('wfpl_image_width_small', WFPL_IMAGE_WIDTH_SMALL); - tem_set('wfpl_image_width_thumb', WFPL_IMAGE_WIDTH_THUMB); - tem_set('form', $data); - tem_set('$head'); # wysiwyg init goes in + if ($history_id) { + message('The fields below have been filled with an archived version of this page. To publish this version (revert the page) click "save" button at the bottom. Feel free to make changes before saving.'); + $history_data = db_get_assoc('history_cms_pages', 'id,'.ADMIN_PAGES_DB_FIELDS, 'where history_id=%i', $history_id); + if (!$history_data) { + message("Error 3938 please inform developer"); + return './admin_pages'; + } + $id = $history_data['id']; + } elseif ($id) { + if (db_count('history_cms_pages', 'where id=%i', $id) > 1) { + tem_set('archived_versions'); + } + } + if($id) { + tem_set('id', $id); + } + + tem_set('$basename', 'admin_pages'); + + pulldown('layout', [ + ['0', "Full (no sidebar)"], + ['1', "With Plain Sidebar"], + ['2', "With Bordered Sidebar"] + ]); + + $navbar_options = array(array('ignored', 'Not at all'), array('0', 'First')); + $rows = db_get_rows('cms_pages', 'id,coalesce(nullif(nav_title,\'\'), title) as title,navbar', 'where navbar != 0 order by navbar'); + if($rows) for($i = 0; $i < count($rows); ++$i) { + list($other_id, $other_title, $other_ord) = $rows[$i]; + if($other_id != $id) { # don't display ourselves + $navbar_options[] = array($i + 1, "After \"$other_title\""); + } + } + pulldown('navbar', $navbar_options, PULLDOWN_2D); + + if(isset($_POST['title'])) { + $data = admin_pages_get_fields(); + + # We'll save anything (no required fields) + + $data['navbar'] = db_reposition('cms_pages', $id, $data['navbar'], 'navbar', 'page'); + + if($data['navbar'] && $data['filename'] == '') { + message('This page was removed from the navigation column because it does not have a filename. (Pages without filenames are visible only to admins.)'); + $data['navbar'] = 0; + } + + # save + if($id) { + db_update_assoc('cms_pages', $data, 'where id=%i', $id); + message('Page updated.'); + } else { + db_insert_assoc('cms_pages', $data); + $id = db_auto_id(); + message('Page saved.'); + } + + # save to version history + $data['id'] = $id; + $data['history_when'] = time(); + $s = session_auth(); + $data['history_user_id'] = $s['id']; + db_insert_assoc('history_cms_pages', $data); + + # redirect + if ($data['filename'] === 'index') { + return './'; + } elseif($data['filename'] !== '') { + return "./{$data['filename']}"; + } else { + return "./admin_pages?id=$id"; + } + } elseif($id) { + # we've recieved an edit id, but no data. So we grab the values to be edited from the database + if ($history_id) { + $data = $history_data; + } else { + $data = db_get_assoc('cms_pages', ADMIN_PAGES_DB_FIELDS, 'where id=%i', $id); + } + if($data['navbar']) { + $data['navbar'] = db_count('cms_pages', 'where navbar!=0 && navbar<%i', $data['navbar']); + } else { + $data['navbar'] = 'ignored'; + } + } else { + # form not submitted, set default values: + $data = array('filename' => format_cms_filename($_REQUEST['new_filename'])); + } + + if (!isset($data['layout']) || $data['layout'] === '' || $data['layout'] === '0') { + $data['sidebar_editor_display'] = 'none'; + } else { + $data['sidebar_editor_display'] = 'block'; + } + + tem_set('wfpl_images_json', json_encode(admin_pages_get_images())); + tem_set('wfpl_image_width_full', WFPL_IMAGE_WIDTH_FULL); + tem_set('wfpl_image_width_small', WFPL_IMAGE_WIDTH_SMALL); + tem_set('wfpl_image_width_thumb', WFPL_IMAGE_WIDTH_THUMB); + tem_set('form', $data); + tem_set('$head'); # wysiwyg init goes in } diff --git a/admin_users.html b/admin_users.html index 5c6caad..fd764d2 100644 --- a/admin_users.html +++ b/admin_users.html @@ -2,85 +2,85 @@ - - ~$host~ Admin: Manage Accounts + + ~$host~ Admin: Manage Accounts - -

~$host~ Admin Control Panel

- -

Add a new accountEdit account "~name html~"

- - - -

- - - -

~$host~ Admin Control Panel

- -

Manage Accounts

- -

On this page you can manage who can log into this site, and what sort of things they have permission to do once logged in.

- - -

- - - - - - - - - - - - - - - - - - - -

Role	Name	Username	Last Login	Last Active
~role html~(blank)	~name html~(blank)	~username html~(blank)	~last_login html~	~last_active html~	[delete this account]

Download as CSV file

- - -

No accounts in database.

- - -

- + +

~$host~ Admin Control Panel

+ +

Add a new accountEdit account "~name html~"

+ + + +

+ + + +

~$host~ Admin Control Panel

+ +

Manage Accounts

+ +

On this page you can manage who can log into this site, and what sort of things they have permission to do once logged in.

+ + +

+ + + + + + + + + + + + + + + + + + + +

Role	Name	Username	Last Login	Last Active
~role html~(blank)	~name html~(blank)	~username html~(blank)	~last_login html~	~last_active html~	[delete this account]

Download as CSV file

+ + +

No accounts in database.

+ + +