[SUCS Devel] site r666 - in branches/beta: . components lib/Validate static

[imranh at sucs.org]

Author: imranh
Date: 2015-04-13 20:00:08 +0100 (Mon, 13 Apr 2015)
New Revision: 666

Modified:
   branches/beta/
   branches/beta/components/libraryadmin.php
   branches/beta/lib/Validate/ISPN.php
   branches/beta/static/
Log:
Merge 664/665 into beta


Property changes on: branches/beta
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/imranh:590-591
/branches/sucs-site:318-656
/branches/sucs-site/branches/sucs-site:590-591
   + /branches/imranh:590-591
/branches/sucs-site:318-656
/branches/sucs-site/branches/sucs-site:590-591
/trunk:664-665

Modified: branches/beta/components/libraryadmin.php
===================================================================
--- branches/beta/components/libraryadmin.php	2015-04-13 18:51:21 UTC (rev 665)
+++ branches/beta/components/libraryadmin.php	2015-04-13 19:00:08 UTC (rev 666)
@@ -16,7 +16,7 @@
 
 function valid_isbn($isbn) {
 
-        return Validate_ISPN::isbn($isbn);
+        return (new Validate_ISPN)->isbn($isbn);
 }
 
 if ($session->groups[$permission]) {

Modified: branches/beta/lib/Validate/ISPN.php
===================================================================
--- branches/beta/lib/Validate/ISPN.php	2015-04-13 18:51:21 UTC (rev 665)
+++ branches/beta/lib/Validate/ISPN.php	2015-04-13 19:00:08 UTC (rev 666)
@@ -141,7 +141,7 @@
 
         // Requires base class Validate
         require_once 'Validate.php';
-        return Validate::_checkControlNumber($isbn, $weights_isbn, 11, 11);
+        return (new Validate)->_checkControlNumber($isbn, $weights_isbn, 11, 11);
     }
 
 
@@ -172,7 +172,7 @@
 
         // Requires base class Validate
         require_once 'Validate.php';
-        return Validate::_checkControlNumber($issn, $weights_issn, 11, 11);
+        return (new Validate)->_checkControlNumber($issn, $weights_issn, 11, 11);
     }
 
     /**
@@ -212,7 +212,7 @@
 
         // Requires base class Validate
         require_once 'Validate.php';
-        return Validate::_checkControlNumber($ismn, $weights_ismn, 10, 10);
+        return (new Validate)->_checkControlNumber($ismn, $weights_ismn, 10, 10);
     }
 
     /**
@@ -349,7 +349,7 @@
      * @param array $weights holds the weight that will be used in calculations for the validation
      * @return bool    true if number is valid, otherwise false
      * @access public
-     * @see Validate::_checkControlNumber()
+     * @see (new Validate)->_checkControlNumber()
      */
     function process($data, $length, &$weights, $modulo = 10, $subtract = 0)
     {
@@ -365,7 +365,7 @@
 
         // Requires base class Validate
         require_once 'Validate.php';
-        return Validate::_checkControlNumber($data, $weights, $modulo, $subtract);
+        return (new Validate)->_checkControlNumber($data, $weights, $modulo, $subtract);
     }
 }
 ?>


Property changes on: branches/beta/static
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/imranh/static:590-591
/branches/sucs-site/branches/sucs-site/static:590-591
   + /branches/imranh/static:590-591
/branches/sucs-site/branches/sucs-site/static:590-591
/trunk/static:664-665