SlatePermutate Changeset - a13315baa590 · protofusion repositories

Changeset - a13315baa590

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Ethan Zonca - 15 years ago 2010-12-23 21:57:03
ez@ethanzonca.com

Formatting fixes, JS now in header

2 files changed with 29 insertions and 23 deletions:

admin.php

inc/config.inc.example

0 comments (0 inline, 0 general)

admin.php

➞

Show inline comments

@@ @@ -17,25 +17,31 @@ @@
  * You should have received a copy of the GNU Affero General Public License
  * along with SlatePermutate.  If not, see <http://www.gnu.org/licenses/>.
  */
   include_once 'inc/class.page.php';
   $scripts = array('jQuery','jQueryUI');
   $adminpage = new page('Administration',$scripts);
   $adminpage = new page('Administration',$scripts,FALSE);
   $datepicker = '$(function() {
                    $( "#datepicker" ).datepicker();
                    $( "#datepicker" ).datepicker( "option", "dateFormat", "yy-mm-dd" );
                  });';
   $adminpage->headcode_add('datePicker', $adminpage->script_wrap($datepicker), TRUE);
   $adminpage->head();
   if(!isset($admin_pass)) {
     echo "<p>Administration password not configured. See config.inc for more information.</p>";
   if(!isset($admin_pass) || !isset($admin_enable) || $admin_enable !== true) {
     echo "<p>The administration interface is not enabled or is improperly configured. See config.inc for more information.</p>";
     $adminpage->foot();
     exit;
+  }
   // Force authentication
   else if (!isset($_SERVER['PHP_AUTH_USER']) || (!isset($_SERVER['PHP_AUTH_PW'])) || $_SERVER['PHP_AUTH_PW'] != $admin_pass) {
     header('WWW-Authenticate: Basic realm="My Realm"');
     header('HTTP/1.0 401 Unauthorized');
-    echo '<p>You must authenticate to view this page.</p>';
+    echo '<p>You must authenticate to access the administration interface.</p>';
     $adminpage->foot();
     exit;
+  }
   function isBeforeDate($toCheck, $reference) {
     $formatted = date("Y-m-d", $toCheck);
@@ @@ -48,21 +54,20 @@ @@
+  }
   function emptySavedDir($todate = null) {
     // Empty the saved_schedules directory
     $dir = "saved_schedules";
     if(!is_dir($dir)) {
       echo "<p><pre>{$dir}</pre> is not a valid directory!";
+      echo "<p><pre>{$dir}</pre> is not a valid directory! Please check your installation.";
       return;
+    }
     // Do this the new fun php5 OO-way
     foreach(new DirectoryIterator($dir) as $file) {
       if(is_numeric($file->getFilename())){
         $isBeforeDate = isBeforeDate($file->getCTime(), $todate);
         if(!$todate || $isBeforeDate) {
           // unlink($dir . '/' . $file->getFilename());
           $date = date("Y-m-d",$file->getCTime());
           echo "<p>Erased file: " . $dir . '/' . $file->getFilename() . " ({$date})</p>";
+        }
+      }
@@ @@ -88,22 +93,21 @@ @@
     return $result;
+  }
   function getLastRehash(){
     $stats = stat("cache/schools");
     if(!$stats){
-      return "never";
+      return false;
+    }
     return date("F j, Y, g:i a", $stats[9]);
+  }
   function getSchools() {
     if(!stat("cache/schools")){
       return false;
+    }
     $schoolsArr = unserialize(file_get_contents("cache/schools"));
     return $schoolsArr;
+  }
   function schoolsDropList(){
     $schools = getSchools();
@@ @@ -112,15 +116,13 @@ @@
       if(!$school['name'] != "Generic College") {
         echo '<option ';
         if(!$school['crawled']) {
           echo 'class="bold" ';
+        }
         echo 'value="' . $school['name'] . '">';
         echo $school['name'];
         echo $school['name'];
         echo "</option>";
+      }
+    }
     echo "</select>";
+  }
@@ @@ -136,27 +138,24 @@ @@
   $res = checkAction();
   if($res != '') {
     echo '<p><em>' . $res . '</em> <a href="admin.php">(x)</a></p>';
+  }
 ?>
 <!-- Move to pagegen class instantiation -->
 <script>
 	$(function() {
 		$( "#datepicker" ).datepicker();
                 $( "#datepicker" ).datepicker( "option", "dateFormat", "yy-mm-dd" );
 	});
 </script>
 <h3>Update</h3>
 <p>You are currently running version <?php echo SP_PACKAGE_VERSION; ?>. The latest available release is VERSION.</p>
 <h3>Rehash</h3>
 <p>Last rehash ocurred on  <?php echo getLastRehash(); ?>.</p>
 <?php $lastRehash = getLastRehash();
       if($lastRehash) {
         echo "<p>Last rehash ocurred on $lastRehash.</p>";
+      }
       else {
         echo "<p>This installation has not been rehashed. Please <a href=\"admin.php?rehash\">rehash now</a> to download school scheduling metadata.</p>";
+      }
 ?>
 <ul>
   <li><a href="admin.php?rehash">Rehash All Institutions</a></li>
   <li><form action="admin.php">Rehash schedules for <?php schoolsDropList(); ?> <input type="submit" value="Go &raquo;" /> </form></li>
 </ul>
 <h3>Purge</h3>

inc/config.inc.example

➞

Show inline comments

@@ @@ -67,11 +67,18 @@ @@
  */
 /* $reCaptcha_priv = ''; */
 /* $reCaptcha_pub = ''; */
 /**
  * \brief
- *   Password to be used for administration page (admin.php). Setting this variable enables the administration page.
  *   Password to be used for administration page (admin.php)
+ *
  */
 /* $admin_pass = ''; */
 /**
  * \brief
  *    Setting this variable true enables the administration page
+ *
  */
 /* $admin_enable = false; */

0 comments (0 inline, 0 general)