summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorStarla Insigna <hatkirby@fourisland.com>2008-12-20 21:15:56 -0500
committerStarla Insigna <hatkirby@fourisland.com>2008-12-20 21:15:56 -0500
commit03d6589fefd850f793215cb6805c0f0c0989f93f (patch)
treeacead1c8c7fa4539dc78a21b66d023ea871352f4
parent79b46038a7fa8467ed41333a80f88d5279b32153 (diff)
downloadfourisland-03d6589fefd850f793215cb6805c0f0c0989f93f.tar.gz
fourisland-03d6589fefd850f793215cb6805c0f0c0989f93f.tar.bz2
fourisland-03d6589fefd850f793215cb6805c0f0c0989f93f.zip
Added HG Update to Admin
Now, changes can be remotely pushed to the central repository and updated using the Admin panel.
-rwxr-xr-xincludes/bbcode.php1
-rwxr-xr-xpages/admin.php9
-rwxr-xr-xtheme/admin/index.tpl6
3 files changed, 16 insertions, 0 deletions
diff --git a/includes/bbcode.php b/includes/bbcode.php index 4dbb933..69e89e3 100755 --- a/includes/bbcode.php +++ b/includes/bbcode.php
@@ -52,6 +52,7 @@ class BBCode
52 $this->bbcodes2['abbr'] = '<ABBR TITLE="{PARAM}">{CONTENT}</ABBR>'; 52 $this->bbcodes2['abbr'] = '<ABBR TITLE="{PARAM}">{CONTENT}</ABBR>';
53 $this->bbcodes['hidden'] = '<SPAN STYLE="display: none">{CONTENT}</SPAN>'; 53 $this->bbcodes['hidden'] = '<SPAN STYLE="display: none">{CONTENT}</SPAN>';
54 $this->bbcodes['thumb'] = '<A HREF="/images/{CONTENT}"><IMG SRC="http://fourisland.com/thumb.php?file=images/{CONTENT}&mode=scale&by=521&side=0" /></A>'; 54 $this->bbcodes['thumb'] = '<A HREF="/images/{CONTENT}"><IMG SRC="http://fourisland.com/thumb.php?file=images/{CONTENT}&mode=scale&by=521&side=0" /></A>';
55 $this->bbcodes['thumb2'] = '<A HREF="/images/{CONTENT}"><IMG SRC="http://fourisland.com/thumb.php?file=images/{CONTENT}&mode=scale&by=260&side=0" ALIGN="right" /></A>';
55 56
56 $this->init = true; 57 $this->init = true;
57 } 58 }
diff --git a/pages/admin.php b/pages/admin.php index 90e540a..579feed 100755 --- a/pages/admin.php +++ b/pages/admin.php
@@ -683,6 +683,15 @@ if (isLoggedIn())
683 $template->add('BACK', 'the previous page'); 683 $template->add('BACK', 'the previous page');
684 $template->add('MSG', 'I\'m sorry, but this pending quote doesn\'t exist.'); 684 $template->add('MSG', 'I\'m sorry, but this pending quote doesn\'t exist.');
685 } 685 }
686 } else if ($_GET['page'] == 'hgUpdate')
687 {
688 $template = new FITemplate('msg');
689 $template->add('BACK', 'the Admin Panel');
690
691 ob_start();
692 system('hg update');
693 $template->add('MSG', ob_get_contents());
694 ob_end_clean();
686 } else { 695 } else {
687 generateError(404); 696 generateError(404);
688 } 697 }
diff --git a/theme/admin/index.tpl b/theme/admin/index.tpl index c39a380..66fbae3 100755 --- a/theme/admin/index.tpl +++ b/theme/admin/index.tpl
@@ -23,3 +23,9 @@ Welcome to the ubiquitous administration panel!<P>
23<UL> 23<UL>
24 <LI><A HREF="/admin/managePendingQuotes.php">Manage Pending Quotes</A></LI> 24 <LI><A HREF="/admin/managePendingQuotes.php">Manage Pending Quotes</A></LI>
25</UL> 25</UL>
26
27<H3>Administration</H3>
28
29<UL>
30 <LI><A HREF="/admin/hgUpdate.php">HG Update</A></LI>
31</UL>