]> source.dussan.org Git - nextcloud-server.git/commitdiff
Space before tab fixes
authorBart Visscher <bartv@thisnet.nl>
Wed, 29 Aug 2012 18:34:44 +0000 (20:34 +0200)
committerBart Visscher <bartv@thisnet.nl>
Wed, 29 Aug 2012 18:34:44 +0000 (20:34 +0200)
15 files changed:
apps/files/templates/part.breadcrumb.php
apps/files_external/templates/settings.php
apps/files_versions/appinfo/update.php
apps/files_versions/history.php
apps/user_ldap/tests/group_ldap.php
lib/app.php
lib/base.php
lib/db.php
lib/ocsclient.php
lib/public/json.php
lib/public/util.php
lib/setup.php
lib/template.php
lib/util.php
lib/vcategories.php

index 22d9bb4490df64a51b6d3495dc248264eac25cf1..875fc747bb774f41711492a249fb7c95dd296bee 100644 (file)
@@ -1,6 +1,6 @@
        <?php for($i=0; $i<count($_["breadcrumb"]); $i++):
         $crumb = $_["breadcrumb"][$i]; ?>
                <div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo $crumb["dir"];?>' style='background-image:url("<?php echo OCP\image_path('core','breadcrumb.png');?>")'>
-               <a href="<?php echo $_['baseURL'].$crumb["dir"]; ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
+               <a href="<?php echo $_['baseURL'].$crumb["dir"]; ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
                </div>
        <?php endfor;?>
index 7da96135721c3ed5252e96fe96c0b450e247c388..c44b09b180fed3f1d2fc6b1026f87aaef387b173 100644 (file)
@@ -82,7 +82,7 @@
                <br />
 
                <?php if (!$_['isAdminPage']):  ?>
-               <table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
+               <table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
                        <thead>
                                <tr>
                                        <th><?php echo $l->t('SSL root certificates'); ?></th>
index e289b927b3c7af64b445e5db0a6d0a1d4de82c56..52a4850758a0b416372180dc1c94a58fc0c6144d 100644 (file)
@@ -5,12 +5,11 @@ $installedVersion=OCP\Config::getAppValue('files_versions', 'installed_version')
 if (version_compare($installedVersion, '1.0.2', '<')) {
        $users = \OCP\User::getUsers();
        $datadir =  \OCP\Config::getSystemValue('datadirectory').'/';
-    foreach ($users as $user) {
-       $oldPath = $datadir.$user.'/versions';
-       $newPath = $datadir.$user.'/files_versions';
-       if(is_dir($oldPath)) {
-               rename($oldPath, $newPath);
-       }
-    }
-
+       foreach ($users as $user) {
+               $oldPath = $datadir.$user.'/versions';
+               $newPath = $datadir.$user.'/files_versions';
+               if(is_dir($oldPath)) {
+                       rename($oldPath, $newPath);
+               }
+       }
 }
index ea36d6d9f88f40914d8e01c86243cc288a53a40b..0ebb34f45e49cfebb6ca3cff2a943c9d0758fec6 100644 (file)
@@ -35,7 +35,7 @@ if ( isset( $_GET['path'] ) ) {
        // roll back to old version if button clicked
         if( isset( $_GET['revert'] ) ) {
 
-               if( $versions->rollback( $path, $_GET['revert'] ) ) {
+               if( $versions->rollback( $path, $_GET['revert'] ) ) {
 
                        $tmpl->assign( 'outcome_stat', 'success' );
 
index 106459580fa0e8e900f4c88c694724d441946576..ac66a608b7699ed55b383bbef8332a81038b69e1 100644 (file)
@@ -29,7 +29,7 @@ class Test_Group_Ldap extends UnitTestCase {
                OC_Group::useBackend(new OCA\user_ldap\GROUP_LDAP());
                $group_ldap = new OCA\user_ldap\GROUP_LDAP();
 
-               $this->assertIsA(OC_Group::getGroups(),gettype(array()));
+               $this->assertIsA(OC_Group::getGroups(),gettype(array()));
                $this->assertIsA($group_ldap->getGroups(),gettype(array()));
 
                $this->assertFalse(OC_Group::inGroup('john','dosers'),gettype(false));
index 74315903467fc332b3f6c5740f0fbb8fb7268a5a..f6708ecb3df15a0bc0df373b43ddc00ec13e62f4 100755 (executable)
@@ -286,7 +286,7 @@ class OC_App{
                if(OC_Config::getValue('knowledgebaseenabled', true)==true){
                        $settings = array(
                                array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "help.php" ), "name" => $l->t("Help"), "icon" => OC_Helper::imagePath( "settings", "help.svg" ))
-                       );
+                       );
                }
 
                // if the user is logged-in
@@ -313,7 +313,7 @@ class OC_App{
 
                                $settings[]=array( "id" => "admin", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "admin.php" ), "name" => $l->t("Admin"), "icon" => OC_Helper::imagePath( "settings", "admin.svg" ));
                        }
-               }
+               }
 
                $navigation = self::proceedNavigation($settings);
                return $navigation;
index 0c3ab8527a905ee737c4f8e65eb2288171fd375e..1798bf09b95b94d89a63098588a155b9ba7e4b3c 100644 (file)
@@ -533,7 +533,7 @@ class OC{
        protected static function tryBasicAuthLogin() {
                if (!isset($_SERVER["PHP_AUTH_USER"])
                 || !isset($_SERVER["PHP_AUTH_PW"])){
-                       return false;
+                       return false;
                }
                OC_App::loadApps(array('authentication'));
                if (OC_User::login($_SERVER["PHP_AUTH_USER"],$_SERVER["PHP_AUTH_PW"]))  {
index ecaf9e37ee565ad8786a4e4587121448ab87f0ca..de72dee2554e3c254cd8920ae78bfd822514e58c 100644 (file)
@@ -592,21 +592,21 @@ class OC_DB {
         * @param $file string path to the MDB2 xml db export file
         */
        public static function replaceDB( $file ){
-               $apps = OC_App::getAllApps();
-               self::beginTransaction();
-               // Delete the old tables
-               self::removeDBStructure( OC::$SERVERROOT . '/db_structure.xml' );
-
-               foreach($apps as $app){
-                       $path = OC_App::getAppPath($app).'/appinfo/database.xml';
-                       if(file_exists($path)){
-                               self::removeDBStructure( $path );
-                       }
-               }
-
-               // Create new tables
-               self::createDBFromStructure( $file );
-               self::commit();
+               $apps = OC_App::getAllApps();
+               self::beginTransaction();
+               // Delete the old tables
+               self::removeDBStructure( OC::$SERVERROOT . '/db_structure.xml' );
+
+               foreach($apps as $app){
+                       $path = OC_App::getAppPath($app).'/appinfo/database.xml';
+                       if(file_exists($path)){
+                               self::removeDBStructure( $path );
+                       }
+               }
+
+               // Create new tables
+               self::createDBFromStructure( $file );
+               self::commit();
 
         }
 
index 9d51004669727cee657426ef110dce3cb07559db..f05a9af31c2e0caa637075720a8554329a21721f 100644 (file)
@@ -187,7 +187,7 @@ class OC_OCSClient{
                if(isset($tmp->downloadlink)) {
                        $app['downloadlink']=$tmp->downloadlink;
                }else{
-                       $app['downloadlink']='';
+                       $app['downloadlink']='';
                }
                return $app;
        }
index 2a74535f41711fce58741832f96e639f8f42a1c0..c37b42c3f74247f07f5c247ee25d710dc491663c 100644 (file)
@@ -92,7 +92,7 @@ class JSON {
        * Send json success msg
        *
        * Return a json success message with optional extra data.
-       * @see OCP\JSON::error()                for the format to use.
+       * @see OCP\JSON::error()                for the format to use.
        *
        * @param array $data The data to use
        * @return string json formatted string.
index 8d7303bf7a4eba130170efccc749c30610e62579..6ad578441e2a163ee2a59c874afa6793cb09c1c7 100644 (file)
@@ -260,7 +260,7 @@ class Util {
 
 
        /**
-        * Register an get/post call. This is important to prevent CSRF attacks
+        * Register an get/post call. This is important to prevent CSRF attacks
         * TODO: write example
         */
        public static function callRegister(){
index e60a461debf2868f9a54f967cb3df5423ef1af28..271fe55fd707c778915418d72366a25ff5b928c6 100644 (file)
@@ -84,8 +84,8 @@ class OC_Setup {
 
                        //write the config file
                        OC_Config::setValue('datadirectory', $datadir);
-                       OC_Config::setValue('dbtype', $dbtype);
-                       OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
+                       OC_Config::setValue('dbtype', $dbtype);
+                       OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
                        if($dbtype == 'mysql') {
                                $dbuser = $options['dbuser'];
                                $dbpass = $options['dbpass'];
@@ -552,7 +552,7 @@ class OC_Setup {
                $content.= "</IfModule>\n";
                $content.= "<IfModule mod_rewrite.c>\n";
                $content.= "RewriteEngine on\n";
-               $content.= "RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]\n";
+               $content.= "RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]\n";
                $content.= "RewriteRule ^.well-known/host-meta /public.php?service=host-meta [QSA,L]\n";
                $content.= "RewriteRule ^.well-known/carddav /remote.php/carddav/ [R]\n";
                $content.= "RewriteRule ^.well-known/caldav /remote.php/caldav/ [R]\n";
index 609c8da97638992094de43bda1b2e1401fb8c958..fe8a3c799431a12ffc531bf29d5b2140f09790e7 100644 (file)
@@ -171,8 +171,8 @@ class OC_Template{
         * mobile -> interface for smartphones
         * tablet -> interface for tablets
         * standalone -> the default interface but without header, footer and
-        *      sidebar, just the application. Useful to use just a specific
-        *      app on the desktop in a standalone window.
+        *      sidebar, just the application. Useful to use just a specific
+        *      app on the desktop in a standalone window.
         */
        public static function detectFormfactor(){
                // please add more useragent strings for other devices
index f543f742ac17834baf61aa628a4dbaa03b8a86f2..24f80b9389698768bb0954bd8210352b48aeaf7f 100755 (executable)
@@ -219,7 +219,7 @@ class OC_Util {
                $CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
                //check for correct file permissions
                if(!stristr(PHP_OS, 'WIN')){
-                       $permissionsModHint="Please change the permissions to 0770 so that the directory cannot be listed by other users.";
+                       $permissionsModHint="Please change the permissions to 0770 so that the directory cannot be listed by other users.";
                        $prems=substr(decoct(@fileperms($CONFIG_DATADIRECTORY)),-3);
                        if(substr($prems,-1)!='0'){
                                OC_Helper::chmodr($CONFIG_DATADIRECTORY,0770);
index 60cc034f780900714feb07ac4c23dd0a6ff29eaa..05dfe18db6f3a48dc42f14a2b01c6867fc208212 100644 (file)
@@ -129,7 +129,7 @@ class OC_VCategories {
        *                       $objects[] = $row['carddata'];
        *               }
        *       }
-       *       $categories->rescan($objects);
+       *       $categories->rescan($objects);
        */
        public function rescan($objects, $sync=true, $reset=true) {
                if($reset === true) {