ported checkLoggedIn and checkAdmin

diff --git a/apps/admin_migrate/settings.php b/apps/admin_migrate/settings.php
old mode 100644 (file)
new mode 100755 (executable)
index 94bf605..da96e1a
--- a/apps/admin_migrate/settings.php
+++ b/apps/admin_migrate/settings.php
@@ -22,7 +22,7 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-OC_Util::checkAdminUser();
+OCP\User::checkAdminUser();
 OC_Util::checkAppEnabled('admin_migrate');
 
 // Export?

diff --git a/apps/bookmarks/addBm.php b/apps/bookmarks/addBm.php
old mode 100644 (file)
new mode 100755 (executable)
index 27e01bb..afe6187
--- a/apps/bookmarks/addBm.php
+++ b/apps/bookmarks/addBm.php
@@ -24,7 +24,7 @@
 
 
 // Check if we are a user
-OC_Util::checkLoggedIn();
+OCP\User::checkLoggedIn();
 OC_Util::checkAppEnabled('bookmarks');
 
 require_once('bookmarksHelper.php');

diff --git a/apps/bookmarks/index.php b/apps/bookmarks/index.php
index 575c14c114c1b869ca9513a2d7c893f5073074a5..7ab74c5f3f31427e48f103ea6b03e02fa3a0bfab 100755 (executable)
--- a/apps/bookmarks/index.php
+++ b/apps/bookmarks/index.php
@@ -24,7 +24,7 @@
 
 
 // Check if we are a user
-OC_Util::checkLoggedIn();
+OCP\User::checkLoggedIn();
 OC_Util::checkAppEnabled('bookmarks');
 
 OC_App::setActiveNavigationEntry( 'bookmarks_index' );

diff --git a/apps/calendar/export.php b/apps/calendar/export.php
old mode 100644 (file)
new mode 100755 (executable)
index 0972ee0..9b71bc6
--- a/apps/calendar/export.php
+++ b/apps/calendar/export.php
@@ -7,7 +7,7 @@
  */
 
  
-OC_Util::checkLoggedIn();
+OCP\User::checkLoggedIn();
 OC_Util::checkAppEnabled('calendar');
 $cal = isset($_GET['calid']) ? $_GET['calid'] : NULL;
 $event = isset($_GET['eventid']) ? $_GET['eventid'] : NULL;

diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index cc6b19a0402163b839699318803a4fd1b598347f..77550420b53bada896f35d6bfa845bffab529bb8 100755 (executable)
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -7,7 +7,7 @@
  */
 
  
-OC_Util::checkLoggedIn();
+OCP\User::checkLoggedIn();
 OC_Util::checkAppEnabled('calendar');
 
 // Create default calendar ...

diff --git a/apps/contacts/export.php b/apps/contacts/export.php
old mode 100644 (file)
new mode 100755 (executable)
index 95d02a9..84bf260
--- a/apps/contacts/export.php
+++ b/apps/contacts/export.php
@@ -7,7 +7,7 @@
  */
 
  
-OC_Util::checkLoggedIn();
+OCP\User::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
 $bookid = isset($_GET['bookid']) ? $_GET['bookid'] : NULL;
 $contactid = isset($_GET['contactid']) ? $_GET['contactid'] : NULL;

diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index a680da3fa9766bd8935970f3ae3e7c7f3f34ecc6..8f2a561b312a9051109ec5e2bc8ffb936808bf62 100755 (executable)
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -9,7 +9,7 @@
 
 
 // Check if we are a user
-OC_Util::checkLoggedIn();
+OCP\User::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
 
 // Get active address books. This creates a default one if none exists.

diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php
index f9e62455c13040fafcec0019603bea5ee806b667..12d7f370710f6c36bb6d8e6ca9bc99dfa63472e8 100755 (executable)
--- a/apps/contacts/photo.php
+++ b/apps/contacts/photo.php
@@ -10,7 +10,7 @@
 
 // Init owncloud
 
-OC_Util::checkLoggedIn();
+OCP\User::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
 
 function getStandardImage(){

diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index 1f9fbd7135e4c2361ceaf11e463df493d98445c4..ab5d160135e0def5f0b6e478ea8723cad80a9235 100755 (executable)
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -23,7 +23,7 @@
 // Init owncloud
 
 OC_JSON::checkLoggedIn();
-//OC_Util::checkLoggedIn();
+//OCP\User::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
 
 function getStandardImage(){

diff --git a/apps/external/ajax/setsites.php b/apps/external/ajax/setsites.php
old mode 100644 (file)
new mode 100755 (executable)
index 3223bf6..5f36b3d
--- a/apps/external/ajax/setsites.php
+++ b/apps/external/ajax/setsites.php
@@ -7,7 +7,7 @@
  */
 
  
-OC_Util::checkAdminUser();
+OCP\User::checkAdminUser();
 
 $sites = array();
 for ($i = 0; $i < sizeof($_POST['site_name']); $i++) {

diff --git a/apps/external/index.php b/apps/external/index.php
old mode 100644 (file)
new mode 100755 (executable)
index 0baa62a..1d4e5cc
--- a/apps/external/index.php
+++ b/apps/external/index.php
@@ -23,7 +23,7 @@
 
 require_once('lib/external.php');
 
-OC_Util::checkLoggedIn();
+OCP\User::checkLoggedIn();
 
 if (isset($_GET['id'])) {
 

diff --git a/apps/external/settings.php b/apps/external/settings.php
index a0c4bb0523d8c819352ebbd7b2cc8373942c2c44..c1a4242c3336dbff1f147408a1346d7b0b99f06c 100755 (executable)
--- a/apps/external/settings.php
+++ b/apps/external/settings.php
@@ -1,6 +1,6 @@
 <?php
 
-OC_Util::checkAdminUser();
+OCP\User::checkAdminUser();
 
 OCP\Util::addscript( "external", "admin" );
 

diff --git a/apps/files/admin.php b/apps/files/admin.php
old mode 100644 (file)
new mode 100755 (executable)
index bdea705..ae7ea04
--- a/apps/files/admin.php
+++ b/apps/files/admin.php
@@ -25,7 +25,7 @@
 // Init owncloud
  
 
-OC_Util::checkAdminUser();
+OCP\User::checkAdminUser();
 
 $htaccessWorking=(getenv('htaccessWorking')=='true');
 

diff --git a/apps/files/ajax/download.php b/apps/files/ajax/download.php
old mode 100644 (file)
new mode 100755 (executable)
index 65c04c3..fd2d9b8
--- a/apps/files/ajax/download.php
+++ b/apps/files/ajax/download.php
@@ -28,7 +28,7 @@ $RUNTIME_APPTYPES=array('filesystem');
 
 
 // Check if we are a user
-OC_Util::checkLoggedIn();
+OCP\User::checkLoggedIn();
 
 $files = $_GET["files"];
 $dir = $_GET["dir"];

diff --git a/apps/files/download.php b/apps/files/download.php
old mode 100644 (file)
new mode 100755 (executable)
index ec4a6e1..a4077b9
--- a/apps/files/download.php
+++ b/apps/files/download.php
@@ -25,7 +25,7 @@
  
 
 // Check if we are a user
-OC_Util::checkLoggedIn();
+OCP\User::checkLoggedIn();
 
 $filename = $_GET["file"];
 

diff --git a/apps/files/index.php b/apps/files/index.php
index 180452593ab9a541d8595ef8519d8bc64fd8e922..2d3b0a13b2505b1c67364deb88959097210c8b47 100755 (executable)
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -22,7 +22,7 @@
 */
 
 // Check if we are a user
-OC_Util::checkLoggedIn();
+OCP\User::checkLoggedIn();
 
 // Load the files we need
 OCP\Util::addStyle( "files", "files" );

diff --git a/apps/files/settings.php b/apps/files/settings.php
index 46d557b43ca3411254110f45aff5343894348cb6..cfadc54573da05e68d062926418add71fe531d32 100755 (executable)
--- a/apps/files/settings.php
+++ b/apps/files/settings.php
@@ -26,7 +26,7 @@
  
 
 // Check if we are a user
-OC_Util::checkLoggedIn();
+OCP\User::checkLoggedIn();
 
 // Load the files we need
 OCP\Util::addStyle( "files", "files" );

diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php
index 9a8a36219ae3b50bcd5b0f1e67284a8326c728e6..e607348a037b9c374192ad5023fa05575e0713eb 100755 (executable)
--- a/apps/files_sharing/list.php
+++ b/apps/files_sharing/list.php
@@ -23,7 +23,7 @@
 
 require_once('lib_share.php');
 
-OC_Util::checkLoggedIn();
+OCP\User::checkLoggedIn();
 OC_Util::checkAppEnabled('files_sharing');
 
 OC_App::setActiveNavigationEntry("files_sharing_list");

diff --git a/apps/files_sharing/settings.php b/apps/files_sharing/settings.php
index da38b88d79e28f65420ad7881d7a6f1b6cf21e3c..26c8df682bbb3cda1ea599ac62231890f80a5fcd 100755 (executable)
--- a/apps/files_sharing/settings.php
+++ b/apps/files_sharing/settings.php
@@ -1,6 +1,6 @@
 <?php
 
-OC_Util::checkAdminUser();
+OCP\User::checkAdminUser();
 OCP\Util::addscript('files_sharing', 'settings');
 $tmpl = new OC_Template('files_sharing', 'settings');
 $tmpl->assign('allowResharing', OC_Appconfig::getValue('files_sharing', 'resharing', 'yes'));

diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index d806638e01172ad8770a1ff0c3659b44fdde3ffc..eb8886239d31717f0365ac138ee4224f7422d37a 100755 (executable)
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -22,7 +22,7 @@
  */
 require_once( '../../lib/base.php' );
 
-OC_Util::checkLoggedIn( );
+OCP\User::checkLoggedIn( );
 OCP\Util::addStyle('files_versions','versions');
 $tmpl = new OC_Template( 'files_versions', 'history', 'user' );
 

diff --git a/apps/files_versions/settings.php b/apps/files_versions/settings.php
index c6312b7be7ba45e0259eb0640227b61c9dba2650..59609de15b4e8c3e37542326c0ea40c95cae9510 100755 (executable)
--- a/apps/files_versions/settings.php
+++ b/apps/files_versions/settings.php
@@ -1,6 +1,6 @@
 <?php
 
-OC_Util::checkAdminUser();
+OCP\User::checkAdminUser();
 
 OCP\Util::addscript( 'files_versions', 'versions' );
 

diff --git a/apps/gallery/index.php b/apps/gallery/index.php
index cc6faa1406b8c75d0afcab9afbc93907dd61b2b4..1d7fc1aee748847fd9e28229829d8d62016cc3bd 100755 (executable)
--- a/apps/gallery/index.php
+++ b/apps/gallery/index.php
@@ -23,7 +23,7 @@
 
 
 
-OC_Util::checkLoggedIn();
+OCP\User::checkLoggedIn();
 OC_Util::checkAppEnabled('gallery');
 OC_App::setActiveNavigationEntry( 'gallery_index' );
 

diff --git a/apps/media/index.php b/apps/media/index.php
index ee0681668a566ee7af6267f5e357c93f7ce1b120..0d226cb0ca15daf31edda33a650b158b7d1f7d0f 100755 (executable)
--- a/apps/media/index.php
+++ b/apps/media/index.php
@@ -25,7 +25,7 @@
 
 
 // Check if we are a user
-OC_Util::checkLoggedIn();
+OCP\User::checkLoggedIn();
 OC_Util::checkAppEnabled('media');
 
 require_once(OC::$APPSROOT . '/apps/media/lib_collection.php');

diff --git a/apps/user_migrate/admin.php b/apps/user_migrate/admin.php
index e94bda5baec4d41c974728107d03407991f4544b..028433939c59bcb5b949747ed59a99cfb93f0109 100755 (executable)
--- a/apps/user_migrate/admin.php
+++ b/apps/user_migrate/admin.php
@@ -20,7 +20,7 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-OC_Util::checkAdminUser();
+OCP\User::checkAdminUser();
 OC_Util::checkAppEnabled('user_migrate');
 
 // Import?

diff --git a/lib/public/user.php b/lib/public/user.php
index febac06730f4cdea5399ffd18f4c5ee26a01db32..b39235bb96507829cd256b01b0091282be769c6a 100644 (file)
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -84,6 +84,21 @@ class User {
                return \OC_USER::checkPassword($uid, $password);
        }
 
+        /**
+        * Check if the user is a admin, redirects to home if not
+        */
+        public static function checkAdminUser(){
+                \OC_Util::checkAdminUser();
+        }
+
+        /**
+        * Check if the user is logged in, redirects to home if not. With
+        * redirect URL parameter to the request URI.
+        */
+        public static function checkLoggedIn(){
+                \OC_Util::checkLoggedIn();
+        }
+
 
 }
 

diff --git a/lib/public/util.php b/lib/public/util.php
index c4a73a5a7fc2d153629268141d093b6898108b8f..5cfcbaeeffc4e82039f63e6fa57c12c6adca20c8 100644 (file)
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -122,6 +122,15 @@ class Util {
 
 
 
+
+
+
+
+
+
+
+
+
 }
 
 ?>